Skip to content

xds interop: Update Docker images to eclipse-temurin:11-jre (v1.46.x backport) #10191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sergiitk merged 1 commit into from
May 17, 2023
+16 −2
Merged

xds interop: Update Docker images to eclipse-temurin:11-jre (v1.46.x backport) #10191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion buildscripts/xds-k8s/test-client.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"]
9 changes: 8 additions & 1 deletion buildscripts/xds-k8s/test-server.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"]