From 8b2d4fb7efce1acfc27e3446fde07b63bf1b05f3 Mon Sep 17 00:00:00 2001 From: Ramkumar Chinchani <45800463+rchincha@users.noreply.github.com> Date: Tue, 21 Nov 2023 04:54:07 -0800 Subject: [PATCH] ci: move distroless to debian12 (#2056) See: https://github.com/GoogleContainerTools/distroless/issues/1467 Signed-off-by: Ramkumar Chinchani --- build/Dockerfile | 2 +- build/Dockerfile-conformance | 2 +- build/Dockerfile-minimal | 2 +- build/Dockerfile-zb | 2 +- build/Dockerfile-zxp | 2 +- build/stacker-conformance.yaml | 2 +- build/stacker-minimal.yaml | 2 +- build/stacker-zb.yaml | 2 +- build/stacker-zxp.yaml | 2 +- build/stacker.yaml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 5e8e129a2..f5f590854 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -27,7 +27,7 @@ RUN echo '{\n\ # --- # Stage 2: Final image with nothing but certs, binary, and default config file # --- -FROM gcr.io/distroless/base AS final +FROM gcr.io/distroless/base-debian12 AS final ARG TARGETOS ARG TARGETARCH COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt diff --git a/build/Dockerfile-conformance b/build/Dockerfile-conformance index 329a5880a..4fc9aa886 100644 --- a/build/Dockerfile-conformance +++ b/build/Dockerfile-conformance @@ -24,7 +24,7 @@ storage:\n\ # --- # Stage 2: Final image with nothing but certs, binary, and default config file # --- -FROM gcr.io/distroless/base AS final +FROM gcr.io/distroless/base-debian12 AS final ARG TARGETOS ARG TARGETARCH COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt diff --git a/build/Dockerfile-minimal b/build/Dockerfile-minimal index 5538f2640..ce6bb5139 100644 --- a/build/Dockerfile-minimal +++ b/build/Dockerfile-minimal @@ -27,7 +27,7 @@ RUN echo '{\n\ # --- # Stage 2: Final image with nothing but certs, binary, and default config file # --- -FROM gcr.io/distroless/base AS final +FROM gcr.io/distroless/base-debian12 AS final ARG TARGETOS ARG TARGETARCH COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt diff --git a/build/Dockerfile-zb b/build/Dockerfile-zb index 1e82ebc80..1a2d1095b 100644 --- a/build/Dockerfile-zb +++ b/build/Dockerfile-zb @@ -15,7 +15,7 @@ RUN make COMMIT=$COMMIT OS=$TARGETOS ARCH=$TARGETARCH clean bench # --- # Stage 2: Final image with nothing but certs, binary, and default config file # --- -FROM gcr.io/distroless/base AS final +FROM gcr.io/distroless/base-debian12 AS final ARG TARGETOS ARG TARGETARCH COPY --from=builder /go/src/github.com/project-zot/zot/bin/zb-$TARGETOS-$TARGETARCH /usr/bin/zb diff --git a/build/Dockerfile-zxp b/build/Dockerfile-zxp index 285387cef..95689f20e 100644 --- a/build/Dockerfile-zxp +++ b/build/Dockerfile-zxp @@ -28,7 +28,7 @@ RUN echo '{\n\ # --- # Stage 2: Final image with nothing but binary and default config file # --- -FROM gcr.io/distroless/base AS final +FROM gcr.io/distroless/base-debian12 AS final ARG TARGETOS ARG TARGETARCH COPY --from=builder /go/src/github.com/project-zot/zot/bin/zxp-$TARGETOS-$TARGETARCH /zxp diff --git a/build/stacker-conformance.yaml b/build/stacker-conformance.yaml index ef38b878f..c3840c75c 100644 --- a/build/stacker-conformance.yaml +++ b/build/stacker-conformance.yaml @@ -46,7 +46,7 @@ build: arch: ${{ARCH}} from: type: docker - url: docker://gcr.io/distroless/base:latest-${{ARCH}} + url: docker://gcr.io/distroless/base-debian12:latest-${{ARCH}} overlay_dirs: - source: ../.build/${{REPO_NAME}}/binary dest: /usr/local/bin diff --git a/build/stacker-minimal.yaml b/build/stacker-minimal.yaml index f182937b6..d5b52f10c 100644 --- a/build/stacker-minimal.yaml +++ b/build/stacker-minimal.yaml @@ -45,7 +45,7 @@ build: arch: ${{ARCH}} from: type: docker - url: docker://gcr.io/distroless/base:latest-${{ARCH}} + url: docker://gcr.io/distroless/base-debian12:latest-${{ARCH}} overlay_dirs: - source: ../.build/${{REPO_NAME}}/binary dest: /usr/local/bin diff --git a/build/stacker-zb.yaml b/build/stacker-zb.yaml index 447e34588..f6c499ec0 100644 --- a/build/stacker-zb.yaml +++ b/build/stacker-zb.yaml @@ -24,7 +24,7 @@ build: arch: ${{ARCH}} from: type: docker - url: docker://gcr.io/distroless/base:latest-${{ARCH}} + url: docker://gcr.io/distroless/base-debian12:latest-${{ARCH}} overlay_dirs: - source: ../.build/${{REPO_NAME}}/binary dest: /usr/local/bin diff --git a/build/stacker-zxp.yaml b/build/stacker-zxp.yaml index 933f800be..ce1980706 100644 --- a/build/stacker-zxp.yaml +++ b/build/stacker-zxp.yaml @@ -44,7 +44,7 @@ build: arch: ${{ARCH}} from: type: docker - url: docker://gcr.io/distroless/base:latest-${{ARCH}} + url: docker://gcr.io/distroless/base-debian12:latest-${{ARCH}} overlay_dirs: - source: ../.build/${{REPO_NAME}}/binary dest: /usr/local/bin diff --git a/build/stacker.yaml b/build/stacker.yaml index 77999aa7f..98fa5972c 100644 --- a/build/stacker.yaml +++ b/build/stacker.yaml @@ -59,7 +59,7 @@ build: arch: ${{ARCH}} from: type: docker - url: docker://gcr.io/distroless/base:latest-${{ARCH}} + url: docker://gcr.io/distroless/base-debian12:latest-${{ARCH}} overlay_dirs: - source: ../.build/${{REPO_NAME}}/binary dest: /usr/local/bin