From e399f1d447b3b2e1da0caebc9cb79e54f87283a9 Mon Sep 17 00:00:00 2001 From: Eugene Ostroukhov Date: Thu, 20 Jul 2023 11:26:15 -0700 Subject: [PATCH] [Build] Update Phusion baseimage (#33767) Fixes b/282107030 I tested this locally by building the images and running some PSM interop tests. --- .../interoptest/grpc_interop_cxx_xds/Dockerfile.xds_client | 4 ++-- .../interoptest/grpc_interop_cxx_xds/Dockerfile.xds_server | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/dockerfile/interoptest/grpc_interop_cxx_xds/Dockerfile.xds_client b/tools/dockerfile/interoptest/grpc_interop_cxx_xds/Dockerfile.xds_client index 5cc368bad28ad..9feea3396d696 100644 --- a/tools/dockerfile/interoptest/grpc_interop_cxx_xds/Dockerfile.xds_client +++ b/tools/dockerfile/interoptest/grpc_interop_cxx_xds/Dockerfile.xds_client @@ -14,7 +14,7 @@ # Dockerfile for building //test/cpp/interop:xds_interop_client -FROM phusion/baseimage:master@sha256:65ea10d5f757e5e86272625f8675d437dd83d8db64bdb429e2354d58f5462750 +FROM phusion/baseimage:master@sha256:e757fe8c7adcb9f798c0eb9dfff31bbf7d91538a1002031d7cdf3e5bf9cf71fc RUN apt-get update -y && \ apt-get install -y \ @@ -32,7 +32,7 @@ COPY . . RUN tools/bazel build //test/cpp/interop:xds_interop_client RUN cp -rL /workdir/bazel-bin/test/cpp/interop/xds_interop_client /artifacts/ -FROM phusion/baseimage:master@sha256:65ea10d5f757e5e86272625f8675d437dd83d8db64bdb429e2354d58f5462750 +FROM phusion/baseimage:master@sha256:e757fe8c7adcb9f798c0eb9dfff31bbf7d91538a1002031d7cdf3e5bf9cf71fc COPY --from=0 /artifacts ./ ENV GRPC_VERBOSITY="DEBUG" diff --git a/tools/dockerfile/interoptest/grpc_interop_cxx_xds/Dockerfile.xds_server b/tools/dockerfile/interoptest/grpc_interop_cxx_xds/Dockerfile.xds_server index 1209d0f1c9b7f..83c0e61a40d1a 100644 --- a/tools/dockerfile/interoptest/grpc_interop_cxx_xds/Dockerfile.xds_server +++ b/tools/dockerfile/interoptest/grpc_interop_cxx_xds/Dockerfile.xds_server @@ -14,7 +14,7 @@ # Dockerfile for building //test/cpp/interop:xds_interop_client -FROM phusion/baseimage:master@sha256:65ea10d5f757e5e86272625f8675d437dd83d8db64bdb429e2354d58f5462750 +FROM phusion/baseimage:master@sha256:e757fe8c7adcb9f798c0eb9dfff31bbf7d91538a1002031d7cdf3e5bf9cf71fc RUN apt-get update -y && \ apt-get install -y \ @@ -32,7 +32,7 @@ COPY . . RUN tools/bazel build //test/cpp/interop:xds_interop_server RUN cp -rL /workdir/bazel-bin/test/cpp/interop/xds_interop_server /artifacts/ -FROM phusion/baseimage:master@sha256:65ea10d5f757e5e86272625f8675d437dd83d8db64bdb429e2354d58f5462750 +FROM phusion/baseimage:master@sha256:e757fe8c7adcb9f798c0eb9dfff31bbf7d91538a1002031d7cdf3e5bf9cf71fc COPY --from=0 /artifacts ./ ENV GRPC_VERBOSITY="DEBUG"