ci: move distroless to debian12 (#2056)

See: GoogleContainerTools/distroless#1467 Signed-off-by: Ramkumar Chinchani <[email protected]>
project-zot · Nov 21, 2023 · 8b2d4fb · 8b2d4fb
1 parent c7bd2a6
commit 8b2d4fb
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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