From 30c68edfcb63400dbadeff931ea1c31c98aaea9e Mon Sep 17 00:00:00 2001 From: Eugene Ostroukhov Date: Thu, 3 Aug 2023 13:05:48 -0700 Subject: [PATCH] [Interop Test] Rollback image changes (#33979) Fixes build issues --- .dockerignore | 6 ------ .../tests_py3_only/interop/Dockerfile.client | 17 +++++++++++------ .../tests_py3_only/interop/Dockerfile.server | 17 +++++++++++------ .../grpc_interop_cxx_xds/Dockerfile.xds_client | 4 ++-- .../grpc_interop_cxx_xds/Dockerfile.xds_server | 4 ++-- 5 files changed, 26 insertions(+), 22 deletions(-) delete mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 8cd0034b50c..00000000000 --- a/.dockerignore +++ /dev/null @@ -1,6 +0,0 @@ -bazel-bin -bazel-grpc -bazel-out -build -.cache -.git 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 7f8d6118bb6..6bd6d4ce8b3 100644 --- a/src/python/grpcio_tests/tests_py3_only/interop/Dockerfile.client +++ b/src/python/grpcio_tests/tests_py3_only/interop/Dockerfile.client @@ -1,6 +1,11 @@ -FROM python:3.9-slim +FROM phusion/baseimage:master@sha256:e757fe8c7adcb9f798c0eb9dfff31bbf7d91538a1002031d7cdf3e5bf9cf71fc -RUN apt-get update -y && apt-get upgrade -y && apt-get install -y build-essential clang +RUN apt-get update -y && \ + apt-get install -y \ + build-essential \ + clang \ + python3 \ + python3-dev WORKDIR /workdir @@ -11,13 +16,13 @@ COPY . . 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 python:3.9-slim - +FROM phusion/baseimage:master@sha256:e757fe8c7adcb9f798c0eb9dfff31bbf7d91538a1002031d7cdf3e5bf9cf71fc COPY --from=0 /artifacts ./ -RUN apt-get update -y && apt-get upgrade -y - 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 ln -s /usr/bin/python3 /usr/bin/python + 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 75cd9b51bc6..bc63f4ecd9f 100644 --- a/src/python/grpcio_tests/tests_py3_only/interop/Dockerfile.server +++ b/src/python/grpcio_tests/tests_py3_only/interop/Dockerfile.server @@ -1,6 +1,11 @@ -FROM python:3.9-slim +FROM phusion/baseimage:master@sha256:e757fe8c7adcb9f798c0eb9dfff31bbf7d91538a1002031d7cdf3e5bf9cf71fc -RUN apt-get update -y && apt-get upgrade -y && apt-get install -y build-essential clang +RUN apt-get update -y && \ + apt-get install -y \ + build-essential \ + clang \ + python3 \ + python3-dev WORKDIR /workdir @@ -11,13 +16,13 @@ COPY . . 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 python:3.9-slim - +FROM phusion/baseimage:master@sha256:e757fe8c7adcb9f798c0eb9dfff31bbf7d91538a1002031d7cdf3e5bf9cf71fc COPY --from=0 /artifacts ./ -RUN apt-get update -y && apt-get upgrade -y - 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 ln -s /usr/bin/python3 /usr/bin/python + 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 3b68c0e3834..9feea3396d6 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 debian:11 +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 gcr.io/distroless/cc-debian11@sha256:b53fbf5f81f4a120a489fedff2092e6fcbeacf7863fce3e45d99cc58dc230ccc +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 d911e4fc858..83c0e61a40d 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 debian:11 +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 gcr.io/distroless/cc-debian11@sha256:b53fbf5f81f4a120a489fedff2092e6fcbeacf7863fce3e45d99cc58dc230ccc +FROM phusion/baseimage:master@sha256:e757fe8c7adcb9f798c0eb9dfff31bbf7d91538a1002031d7cdf3e5bf9cf71fc COPY --from=0 /artifacts ./ ENV GRPC_VERBOSITY="DEBUG"