Skip to content

Commit

Permalink
[Interop Tests][v1.49] Update Docker images
Browse files Browse the repository at this point in the history
  • Loading branch information
eugeneo committed Sep 1, 2023
1 parent dcaa2f2 commit 0bf898f
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 42 deletions.
21 changes: 10 additions & 11 deletions src/python/grpcio_tests/tests_py3_only/interop/Dockerfile.client
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
FROM phusion/baseimage:master@sha256:65ea10d5f757e5e86272625f8675d437dd83d8db64bdb429e2354d58f5462750
FROM python:3.9-slim-bookworm

RUN apt-get update -y && \
apt-get upgrade -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

Expand All @@ -17,13 +11,18 @@ 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 phusion/baseimage:master@sha256:65ea10d5f757e5e86272625f8675d437dd83d8db64bdb429e2354d58f5462750
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 upgrade -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"]
21 changes: 10 additions & 11 deletions src/python/grpcio_tests/tests_py3_only/interop/Dockerfile.server
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
FROM phusion/baseimage:master@sha256:65ea10d5f757e5e86272625f8675d437dd83d8db64bdb429e2354d58f5462750
FROM python:3.9-slim-bookworm

RUN apt-get update -y && \
apt-get upgrade -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

Expand All @@ -17,13 +11,18 @@ 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 phusion/baseimage:master@sha256:65ea10d5f757e5e86272625f8675d437dd83d8db64bdb429e2354d58f5462750
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 upgrade -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"]
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -32,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 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,eds_lb,xds_cluster_resolver_lb,priority_lb,xds_cluster_impl_lb,weighted_target_lb,lrs_lb,xds_server_config_fetcher,ring_hash_lb,outlier_detection_lb"
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"]
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -32,10 +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 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,eds_lb,xds_cluster_resolver_lb,priority_lb,weighted_target_lb,lrs_lb,xds_cluster_impl_lb,xds_server_config_fetcher"
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"]

0 comments on commit 0bf898f

Please sign in to comment.