[Interop] Make C++ xDS Interop Client and Server Responsive to SIGTERM (#34518)

This PR adds `tini` to the C++ interop client and server to make them responsive to SIGTERM.

Closes #34518

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/34518 from gnossen:ssa_interop_server a762b27178
PiperOrigin-RevId: 610766377
pull/36004/head
Richard Belleville 1 year ago committed by Copybara-Service
parent 40577dd585
commit 12897ab0fb
  1. 9
      tools/dockerfile/interoptest/grpc_interop_cxx_xds/Dockerfile.xds_client
  2. 9
      tools/dockerfile/interoptest/grpc_interop_cxx_xds/Dockerfile.xds_server

@ -27,6 +27,10 @@ COPY . .
RUN tools/bazel build //test/cpp/interop:xds_interop_client
RUN cp -rL /workdir/bazel-bin/test/cpp/interop/xds_interop_client /artifacts/
ENV TINI_VERSION v0.19.0
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
RUN chmod +x /tini
FROM python:3.9-slim-bookworm
ENV GRPC_VERBOSITY="DEBUG"
@ -39,4 +43,7 @@ RUN apt-get update \
COPY --from=0 /artifacts ./
ENTRYPOINT ["/xds_interop_client"]
# tini serves as PID 1 and enables the server to properly respond to signals.
COPY --from=0 /tini /tini
ENTRYPOINT ["/tini", "-g", "-vv", "--", "/xds_interop_client"]

@ -27,6 +27,10 @@ COPY . .
RUN tools/bazel build //test/cpp/interop:xds_interop_server
RUN cp -rL /workdir/bazel-bin/test/cpp/interop/xds_interop_server /artifacts/
ENV TINI_VERSION v0.19.0
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
RUN chmod +x /tini
FROM python:3.9-slim-bookworm
ENV GRPC_VERBOSITY="DEBUG"
@ -39,4 +43,7 @@ RUN apt-get update \
COPY --from=0 /artifacts ./
ENTRYPOINT ["/xds_interop_server"]
# tini serves as PID 1 and enables the server to properly respond to signals.
COPY --from=0 /tini /tini
ENTRYPOINT ["/tini", "-g", "-vv", "--", "/xds_interop_server"]

Loading…
Cancel
Save