diff options
| author | Sergii Tkachenko <sergiitk@google.com> | 2023-05-16 18:20:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-16 15:20:55 -0700 |
| commit | 16b84924a1a16ae619ec81f88b456c187f8965df (patch) | |
| tree | 864b860a3335b9e571e19c5e54e68fb6de47ef13 | |
| parent | 29b8483fd6e80116b417ca883361ab11a6be47bc (diff) | |
| download | grpc-grpc-java-16b84924a1a16ae619ec81f88b456c187f8965df.tar.gz | |
xds interop: Update Docker images to `eclipse-temurin:11-jre` (#10172)
- 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.
| -rw-r--r-- | buildscripts/xds-k8s/test-client.Dockerfile | 9 | ||||
| -rw-r--r-- | 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 220ca038b..67fadb130 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 86f843484..e717b7dc5 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"] |