grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Stanley Cheung 2023-05-30 08:03:36 -07:00 committed by GitHub
parent df85a45742
commit 4277867a7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
buildscripts/observability-test/Dockerfile
View File

@ -17,7 +17,7 @@
# Stage 1: Build the interop test client and server # 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 WORKDIR /grpc-java
COPY . . COPY . .
@ -33,7 +33,7 @@ RUN ./gradlew :grpc-gcp-observability:interop:installDist -PskipCodegen=true -Ps
# with the given parameters. # with the given parameters.
# #
FROM openjdk:11.0.16-jdk-slim-bullseye FROM eclipse-temurin:11-jre
WORKDIR /grpc-java/ WORKDIR /grpc-java/
COPY --from=build /grpc-java/gcp-observability/interop/build/install/interop/. . 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 WORKDIR /grpc-java/buildscripts/observability-test
COPY --from=build /grpc-java/buildscripts/observability-test/run.sh . 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"] ENTRYPOINT ["/grpc-java/buildscripts/observability-test/run.sh"]