Skip to content

Commit f729cb7

Browse files
committed
ci/release: Add test for distroless non-root and fix hash (#44097)
Signed-off-by: Ryan Northey <ryan@synca.io>
1 parent 45716e6 commit f729cb7

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

ci/do_ci.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -861,6 +861,12 @@ case $CI_TARGET in
861861
;;
862862

863863
verify-distroless)
864+
DISTROLESS_TEST_TARGET="${DISTROLESS_TEST_TARGET:-distroless-dev}"
865+
distroless_user="$(docker inspect --format '{{.Config.User}}' envoyproxy/envoy:"${DISTROLESS_TEST_TARGET}")"
866+
if [[ "$distroless_user" == 0 ]]; then
867+
echo "FAIL: Distroless container uses the root user" >&2
868+
exit 1
869+
fi
864870
docker build -f ci/Dockerfile-distroless-testing --target=envoy-distroless -t distroless-testing .
865871
docker run --rm distroless-testing
866872
docker build -f ci/Dockerfile-distroless-testing --target=envoy-contrib-distroless -t distroless-contrib-testing .

distribution/docker/Dockerfile-envoy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ COPY --chown=0:0 --chmod=755 \
5959

6060

6161
# STAGE: envoy-distroless
62-
FROM gcr.io/distroless/base-nossl-debian12:nonroot@sha256:c8430558b9a8688298c060ddc5e6f2993c8a092dee8a6b7058139ac8472e8ad0 AS envoy-distroless
62+
FROM gcr.io/distroless/base-nossl-debian12:nonroot@sha256:177f4df07b055157cc1114033c1e531b251c8f7ef5ef17e1248dc3a52ec4de60 AS envoy-distroless
6363
EXPOSE 10000
6464
ENTRYPOINT ["/usr/local/bin/envoy"]
6565
CMD ["-c", "/etc/envoy/envoy.yaml"]

0 commit comments

Comments
 (0)