Skip to content

Commit

Permalink
Merge pull request #268 from briandowns/issue-116
Browse files Browse the repository at this point in the history
add crictl
  • Loading branch information
briandowns authored Aug 31, 2020
2 parents 1e77f6d + 365405a commit ead88dd
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ ARG KUBERNETES_VERSION=dev
# Build environment
FROM rancher/build-base:v1.14.2 AS build
RUN set -x \
&& export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y update \
&& apt-get -y install \
&& export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y update \
&& apt-get -y install \
libseccomp-dev \
rsync
# Shell used for debugging
FROM build AS shell
RUN set -x \
&& export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y update \
&& apt-get -y install \
&& export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y update \
&& apt-get -y install \
bash \
bash-completion \
git \
Expand Down Expand Up @@ -77,7 +77,8 @@ RUN rm -vf /charts/*.sh /charts/*.md
# must be placed in bin/ of the file image and subdirectories of bin/ will be flattened during installation.
# This means bin/foo/bar will become bin/bar when rke2 installs this to the host
FROM rancher/k3s:v1.18.4-k3s1 AS k3s
FROM rancher/containerd:v1.3.6-k3s2 AS containerd
FROM rancher/containerd:v1.3.6-k3s2 AS containerd
FROM rancher/crictl:v1.18.0 AS crictl

FROM scratch AS runtime
COPY --from=k3s \
Expand All @@ -98,3 +99,6 @@ COPY --from=kubernetes \
COPY --from=charts \
/charts/ \
/charts/
COPY --from=crictl \
/usr/local/bin/crictl \
/bin/

0 comments on commit ead88dd

Please sign in to comment.