From 4277867a7dcfd73706f347f11f6e0476c1d2d032 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Tue, 30 May 2023 08:03:36 -0700 Subject: [PATCH] gcp observability: Update Docker images to eclipse-temurin (#10218) Perform software update so that we install patches for latest vulnerabilities. Similar to the fix in #10191 --- buildscripts/observability-test/Dockerfile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/buildscripts/observability-test/Dockerfile b/buildscripts/observability-test/Dockerfile index e5fd11cb67a..82d21f78263 100644 --- a/buildscripts/observability-test/Dockerfile +++ b/buildscripts/observability-test/Dockerfile @@ -17,7 +17,7 @@ # Stage 1: Build the interop test client and server # -FROM openjdk:11.0.16-jdk-slim-bullseye AS build +FROM eclipse-temurin:11-jdk AS build WORKDIR /grpc-java COPY . . @@ -33,7 +33,7 @@ RUN ./gradlew :grpc-gcp-observability:interop:installDist -PskipCodegen=true -Ps # with the given parameters. # -FROM openjdk:11.0.16-jdk-slim-bullseye +FROM eclipse-temurin:11-jre WORKDIR /grpc-java/ COPY --from=build /grpc-java/gcp-observability/interop/build/install/interop/. . @@ -41,4 +41,11 @@ COPY --from=build /grpc-java/gcp-observability/interop/build/install/interop/. . WORKDIR /grpc-java/buildscripts/observability-test COPY --from=build /grpc-java/buildscripts/observability-test/run.sh . +# 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/* + ENTRYPOINT ["/grpc-java/buildscripts/observability-test/run.sh"]