From 276390e66f8a03791dee8e043ea561e2b99dc20e Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Sun, 30 Aug 2020 20:32:47 -0700 Subject: [PATCH 1/2] add crictl Signed-off-by: Brian Downs --- Dockerfile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 44fbd6328f..84f67a52c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 \ @@ -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.17.0 AS crictl FROM scratch AS runtime COPY --from=k3s \ @@ -98,3 +99,6 @@ COPY --from=kubernetes \ COPY --from=charts \ /charts/ \ /charts/ +COPY --from=crictl \ + /usr/local/bin/crictl \ + /bin/ From 365405a44f38a84bcb2d9f75a5f3228e5fba1362 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Mon, 31 Aug 2020 14:16:29 -0700 Subject: [PATCH 2/2] update crictl to 18 Signed-off-by: Brian Downs --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 84f67a52c5..cd622098f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -78,7 +78,7 @@ RUN rm -vf /charts/*.sh /charts/*.md # 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/crictl:v1.17.0 AS crictl +FROM rancher/crictl:v1.18.0 AS crictl FROM scratch AS runtime COPY --from=k3s \