From f20836a7e3cd130307aeeb756a7aea0a5addcabe Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Mon, 1 Apr 2024 14:21:01 -0700 Subject: [PATCH 1/4] update to use scratch image Signed-off-by: Brian Downs --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a43779f..18bc932 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,4 @@ -ARG BCI_IMAGE=registry.suse.com/bci/bci-base ARG GO_IMAGE=rancher/hardened-build-base:v1.20.12b2 -FROM ${BCI_IMAGE} as bci FROM ${GO_IMAGE} as builder ARG ARCH="amd64" ARG GOOS="linux" @@ -59,5 +57,5 @@ RUN if [ "${ARCH}" = "amd64" ]; then \ RUN install -s bin/* /usr/local/bin RUN containerd --version -FROM bci +FROM scratch COPY --from=builder /usr/local/bin/ /usr/local/bin/ From 169b0aab9f3d39763958e9fce2917e2a99907289 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Mon, 1 Apr 2024 14:44:48 -0700 Subject: [PATCH 2/4] update to use busybox image Signed-off-by: Brian Downs --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 18bc932..d1f93ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ +ARG BCI_IMAGE=registry.suse.com/bci/bci-busybox ARG GO_IMAGE=rancher/hardened-build-base:v1.20.12b2 +FROM ${BCI_IMAGE} as bci FROM ${GO_IMAGE} as builder ARG ARCH="amd64" ARG GOOS="linux" @@ -57,5 +59,5 @@ RUN if [ "${ARCH}" = "amd64" ]; then \ RUN install -s bin/* /usr/local/bin RUN containerd --version -FROM scratch +FROM bci COPY --from=builder /usr/local/bin/ /usr/local/bin/ From c4f0a405a5575205fc8ca96ef8110a47a4722102 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Mon, 1 Apr 2024 15:20:36 -0700 Subject: [PATCH 3/4] update to use scratch image Signed-off-by: Brian Downs --- Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d1f93ce..f8ad895 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,4 @@ -ARG BCI_IMAGE=registry.suse.com/bci/bci-busybox ARG GO_IMAGE=rancher/hardened-build-base:v1.20.12b2 -FROM ${BCI_IMAGE} as bci FROM ${GO_IMAGE} as builder ARG ARCH="amd64" ARG GOOS="linux" @@ -32,7 +30,7 @@ RUN if [ "${ARCH}" == "s390x" ]; then \ # setup containerd build ARG SRC="github.com/k3s-io/containerd" ARG PKG="github.com/containerd/containerd" -ARG TAG="v1.6.19-k3s1" +ARG TAG="v1.7.11-k3s1" RUN git clone --depth=1 https://${SRC}.git $GOPATH/src/${PKG} WORKDIR $GOPATH/src/${PKG} RUN git fetch --tags --depth=1 origin ${TAG} @@ -59,5 +57,5 @@ RUN if [ "${ARCH}" = "amd64" ]; then \ RUN install -s bin/* /usr/local/bin RUN containerd --version -FROM bci +FROM scratch COPY --from=builder /usr/local/bin/ /usr/local/bin/ From 9af6cec1cf627d30208e43b5daf92b0ddd60438d Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Mon, 1 Apr 2024 15:38:06 -0700 Subject: [PATCH 4/4] update to use scratch image Signed-off-by: Brian Downs --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f8ad895..18bc932 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ RUN if [ "${ARCH}" == "s390x" ]; then \ # setup containerd build ARG SRC="github.com/k3s-io/containerd" ARG PKG="github.com/containerd/containerd" -ARG TAG="v1.7.11-k3s1" +ARG TAG="v1.6.19-k3s1" RUN git clone --depth=1 https://${SRC}.git $GOPATH/src/${PKG} WORKDIR $GOPATH/src/${PKG} RUN git fetch --tags --depth=1 origin ${TAG}