From 73d756ceb637c4460e71966e52720b15a362076f Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Tue, 16 May 2023 19:00:32 -0400 Subject: [PATCH] xds interop: Update Docker images to `eclipse-temurin:11-jre` (#10172) (#10182) - Update to xDS Test Client and xDS test server Docker images to `eclipse-temurin:11-jre`. - Perform software update so that we install patches for latest vulnerabilities. --- buildscripts/xds-k8s/test-client.Dockerfile | 9 ++++++++- buildscripts/xds-k8s/test-server.Dockerfile | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/buildscripts/xds-k8s/test-client.Dockerfile b/buildscripts/xds-k8s/test-client.Dockerfile index 220ca038bbc..67fadb1302a 100644 --- a/buildscripts/xds-k8s/test-client.Dockerfile +++ b/buildscripts/xds-k8s/test-client.Dockerfile @@ -1,5 +1,5 @@ # Build runtime image. -FROM openjdk:11.0.9.1-jdk +FROM eclipse-temurin:11-jre ENV APP_DIR=/usr/src/app WORKDIR $APP_DIR @@ -11,5 +11,12 @@ COPY grpc-interop-testing/ $APP_DIR/ COPY logging*.properties $APP_DIR/ ENV JAVA_OPTS="-Djava.util.logging.config.file=$APP_DIR/logging-json.properties" +# Intentionally after the app COPY to force the update on each build. +# Update Ubuntu system packages: +RUN apt-get update \ + && apt-get -y upgrade \ + && apt-get -y autoremove \ + && rm -rf /var/lib/apt/lists/* + # Client ENTRYPOINT ["bin/xds-test-client"] diff --git a/buildscripts/xds-k8s/test-server.Dockerfile b/buildscripts/xds-k8s/test-server.Dockerfile index 86f84348458..e717b7dc526 100644 --- a/buildscripts/xds-k8s/test-server.Dockerfile +++ b/buildscripts/xds-k8s/test-server.Dockerfile @@ -1,5 +1,5 @@ # Build runtime image. -FROM openjdk:11.0.9.1-jdk +FROM eclipse-temurin:11-jre ENV APP_DIR=/usr/src/app WORKDIR $APP_DIR @@ -11,5 +11,12 @@ COPY grpc-interop-testing/ $APP_DIR/ COPY logging*.properties $APP_DIR/ ENV JAVA_OPTS="-Djava.util.logging.config.file=$APP_DIR/logging-json.properties" +# Intentionally after the app COPY to force the update on each build. +# Update Ubuntu system packages: +RUN apt-get update \ + && apt-get -y upgrade \ + && apt-get -y autoremove \ + && rm -rf /var/lib/apt/lists/* + # Server ENTRYPOINT ["bin/xds-test-server"]