[Interop Tests][v1.57] Update Docker images (#34358)
diff --git a/src/python/grpcio_tests/tests_py3_only/interop/Dockerfile.client b/src/python/grpcio_tests/tests_py3_only/interop/Dockerfile.client
index 6bd6d4c..1400361 100644
--- a/src/python/grpcio_tests/tests_py3_only/interop/Dockerfile.client
+++ b/src/python/grpcio_tests/tests_py3_only/interop/Dockerfile.client
@@ -1,11 +1,6 @@
-FROM phusion/baseimage:master@sha256:e757fe8c7adcb9f798c0eb9dfff31bbf7d91538a1002031d7cdf3e5bf9cf71fc
+FROM python:3.9-slim-bookworm
-RUN apt-get update -y && \
- apt-get install -y \
- build-essential \
- clang \
- python3 \
- python3-dev
+RUN apt-get update -y && apt-get upgrade -y && apt-get install -y build-essential clang curl
WORKDIR /workdir
@@ -16,13 +11,18 @@
RUN tools/bazel build -c dbg //src/python/grpcio_tests/tests_py3_only/interop:xds_interop_client
RUN cp -rL /workdir/bazel-bin/src/python/grpcio_tests/tests_py3_only/interop/xds_interop_client* /artifacts/
-FROM phusion/baseimage:master@sha256:e757fe8c7adcb9f798c0eb9dfff31bbf7d91538a1002031d7cdf3e5bf9cf71fc
-COPY --from=0 /artifacts ./
+FROM python:3.9-slim-bookworm
ENV GRPC_VERBOSITY="DEBUG"
ENV GRPC_TRACE="xds_client,xds_resolver,xds_cluster_manager_lb,cds_lb,xds_cluster_resolver_lb,priority_lb,xds_cluster_impl_lb,weighted_target_lb,ring_hash_lb,outlier_detection_lb"
-RUN apt-get update -y && apt-get install -y python3
+RUN apt-get update -y \
+ && apt-get install -y python3 \
+ && apt-get -y autoremove \
+ && rm -rf /var/lib/apt/lists/*
+
RUN ln -s /usr/bin/python3 /usr/bin/python
+COPY --from=0 /artifacts ./
+
ENTRYPOINT ["/xds_interop_client"]
diff --git a/src/python/grpcio_tests/tests_py3_only/interop/Dockerfile.server b/src/python/grpcio_tests/tests_py3_only/interop/Dockerfile.server
index bc63f4e..3fa66e0 100644
--- a/src/python/grpcio_tests/tests_py3_only/interop/Dockerfile.server
+++ b/src/python/grpcio_tests/tests_py3_only/interop/Dockerfile.server
@@ -1,11 +1,6 @@
-FROM phusion/baseimage:master@sha256:e757fe8c7adcb9f798c0eb9dfff31bbf7d91538a1002031d7cdf3e5bf9cf71fc
+FROM python:3.9-slim-bookworm
-RUN apt-get update -y && \
- apt-get install -y \
- build-essential \
- clang \
- python3 \
- python3-dev
+RUN apt-get update -y && apt-get upgrade -y && apt-get install -y build-essential clang curl
WORKDIR /workdir
@@ -16,13 +11,18 @@
RUN tools/bazel build -c dbg //src/python/grpcio_tests/tests_py3_only/interop:xds_interop_server
RUN cp -rL /workdir/bazel-bin/src/python/grpcio_tests/tests_py3_only/interop/xds_interop_server* /artifacts/
-FROM phusion/baseimage:master@sha256:e757fe8c7adcb9f798c0eb9dfff31bbf7d91538a1002031d7cdf3e5bf9cf71fc
-COPY --from=0 /artifacts ./
+FROM python:3.9-slim-bookworm
ENV GRPC_VERBOSITY="DEBUG"
ENV GRPC_TRACE="xds_client,xds_resolver,xds_cluster_manager_lb,cds_lb,xds_cluster_resolver_lb,priority_lb,xds_cluster_impl_lb,weighted_target_lb"
-RUN apt-get update -y && apt-get install -y python3
+RUN apt-get update -y \
+ && apt-get install -y python3 \
+ && apt-get -y autoremove \
+ && rm -rf /var/lib/apt/lists/*
+
RUN ln -s /usr/bin/python3 /usr/bin/python
+COPY --from=0 /artifacts ./
+
ENTRYPOINT ["/xds_interop_server"]
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 9feea33..0a63231 100644
--- a/tools/dockerfile/interoptest/grpc_interop_cxx_xds/Dockerfile.xds_client
+++ b/tools/dockerfile/interoptest/grpc_interop_cxx_xds/Dockerfile.xds_client
@@ -14,14 +14,9 @@
# Dockerfile for building //test/cpp/interop:xds_interop_client
-FROM phusion/baseimage:master@sha256:e757fe8c7adcb9f798c0eb9dfff31bbf7d91538a1002031d7cdf3e5bf9cf71fc
+FROM python:3.9-slim-bookworm
-RUN apt-get update -y && \
- apt-get install -y \
- build-essential \
- clang \
- python3 \
- python3-dev
+RUN apt-get update -y && apt-get upgrade -y && apt-get install -y build-essential clang curl
WORKDIR /workdir
@@ -32,10 +27,16 @@
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:e757fe8c7adcb9f798c0eb9dfff31bbf7d91538a1002031d7cdf3e5bf9cf71fc
-COPY --from=0 /artifacts ./
+FROM python:3.9-slim-bookworm
ENV GRPC_VERBOSITY="DEBUG"
ENV GRPC_TRACE="xds_client,xds_resolver,xds_cluster_manager_lb,cds_lb,xds_cluster_resolver_lb,priority_lb,xds_cluster_impl_lb,weighted_target_lb,xds_server_config_fetcher,ring_hash_lb,outlier_detection_lb,xds_wrr_locality_lb,xds_override_host_lb"
+RUN apt-get update \
+ && apt-get -y upgrade \
+ && apt-get -y autoremove \
+ && rm -rf /var/lib/apt/lists/*
+
+COPY --from=0 /artifacts ./
+
ENTRYPOINT ["/xds_interop_client"]
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 83c0e61..14f33be 100644
--- a/tools/dockerfile/interoptest/grpc_interop_cxx_xds/Dockerfile.xds_server
+++ b/tools/dockerfile/interoptest/grpc_interop_cxx_xds/Dockerfile.xds_server
@@ -14,14 +14,9 @@
# Dockerfile for building //test/cpp/interop:xds_interop_client
-FROM phusion/baseimage:master@sha256:e757fe8c7adcb9f798c0eb9dfff31bbf7d91538a1002031d7cdf3e5bf9cf71fc
+FROM python:3.9-slim-bookworm
-RUN apt-get update -y && \
- apt-get install -y \
- build-essential \
- clang \
- python3 \
- python3-dev
+RUN apt-get update -y && apt-get upgrade -y && apt-get install -y build-essential clang curl
WORKDIR /workdir
@@ -32,10 +27,16 @@
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:e757fe8c7adcb9f798c0eb9dfff31bbf7d91538a1002031d7cdf3e5bf9cf71fc
-COPY --from=0 /artifacts ./
+FROM python:3.9-slim-bookworm
ENV GRPC_VERBOSITY="DEBUG"
ENV GRPC_TRACE="xds_client,xds_resolver,xds_cluster_manager_lb,cds_lb,xds_cluster_resolver_lb,priority_lb,xds_cluster_impl_lb,weighted_target_lb,xds_server_config_fetcher,ring_hash_lb,outlier_detection_lb,xds_wrr_locality_lb,xds_override_host_lb"
+RUN apt-get update \
+ && apt-get -y upgrade \
+ && apt-get -y autoremove \
+ && rm -rf /var/lib/apt/lists/*
+
+COPY --from=0 /artifacts ./
+
ENTRYPOINT ["/xds_interop_server"]
