diff options
| author | Eugene Ostroukhov <eostroukhov@google.com> | 2023-08-31 10:25:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-31 10:25:21 -0700 |
| commit | 4295f0250c6344c1e492bdb45d4ad01ae28d9177 (patch) | |
| tree | bedaa8d550294922bfe4d33c03b748fd1bd989d1 /tools/dockerfile | |
| parent | 2d2e9893cf986606a0303804aa39adfab01dcedd (diff) | |
| download | grpc-grpc-4295f0250c6344c1e492bdb45d4ad01ae28d9177.tar.gz | |
[Interop Test] Update Docker images (#34210)
Co-authored-by: Sergii Tkachenko <hi@sergii.org>
Diffstat (limited to 'tools/dockerfile')
| -rw-r--r-- | tools/dockerfile/interoptest/grpc_interop_cxx_xds/Dockerfile.xds_client | 12 | ||||
| -rw-r--r-- | tools/dockerfile/interoptest/grpc_interop_cxx_xds/Dockerfile.xds_server | 13 |
2 files changed, 18 insertions, 7 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 a420c0cfb0..0a63231f5c 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 python:3.9-slim-bullseye +FROM python:3.9-slim-bookworm RUN apt-get update -y && apt-get upgrade -y && apt-get install -y build-essential clang curl @@ -27,10 +27,16 @@ 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 python:3.9-slim-bullseye -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 c4c729f555..14f33be7fc 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 python:3.9-slim-bullseye +FROM python:3.9-slim-bookworm RUN apt-get update -y && apt-get upgrade -y && apt-get install -y build-essential clang curl @@ -27,11 +27,16 @@ 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 python:3.9-slim-bullseye - -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"] |