Update distroless to debian11 (istio#34893)

* Update distroless to debian11 * Use official image
WillardHu · Aug 27, 2021 · d89c2b3 · d89c2b3
1 parent 7f810ef
commit d89c2b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/docker/Dockerfile.distroless b/docker/Dockerfile.distroless
@@ -1,5 +1,5 @@
 # prepare a distroless source context to copy files from
-FROM gcr.io/distroless/static-debian10@sha256:912bd2c2b9704ead25ba91b631e3849d940f9d533f0c15cf4fc625099ad145b1 as distroless_source
+FROM gcr.io/distroless/static-debian11@sha256:85f0110fd9096b784376948d52e874e2bf79436bd949e9d7e9fca365ded4e611 as distroless_source
 
 # prepare a base dev to modify file contents
 FROM ubuntu:focal as ubuntu_source
@@ -14,7 +14,7 @@ RUN echo istio-proxy:x:1337:1337:istio-proxy:/nonexistent:/sbin/nologin >> /home
 # - password file
 # - groups file
 # - /home/nonroot directory
-FROM gcr.io/distroless/static-debian10@sha256:912bd2c2b9704ead25ba91b631e3849d940f9d533f0c15cf4fc625099ad145b1
+FROM distroless_source
 COPY --from=ubuntu_source /home/etc/passwd /etc/passwd
 COPY --from=ubuntu_source /home/etc/group /etc/group
 COPY --from=ubuntu_source /home/nonroot /home/nonroot
diff --git a/pilot/docker/Dockerfile.proxyv2 b/pilot/docker/Dockerfile.proxyv2
@@ -8,10 +8,11 @@ ARG BASE_VERSION=latest
 FROM gcr.io/istio-release/base:${BASE_VERSION} as default
 
 # The following section is used as base image if BASE_DISTRIBUTION=distroless
-# This image is a custom built debian10 distroless image with multiarchitecture support.
+# This image is a custom built debian11 distroless image with multiarchitecture support.
 # It is built on the base distroless image, with iptables binary and libraries added
 # The source can be found at https://github.com/istio/distroless/tree/iptables
-FROM gcr.io/istio-release/iptables@sha256:e8f940d0d0163ec4563ee070188c1d97308ac08f4a711152ff55f3a81e525140 as distroless
+# This version is from commit a2477f8b37647391020a12527a3a7126ced2b582.
+FROM gcr.io/istio-release/iptables@sha256:e5bbbcdab26db1b5bf580bd823204dc82485545e27ce877ca2ad2eb0dc3b55a0 as distroless
 
 # This will build the final image based on either default or distroless from above
 # hadolint ignore=DL3006