From d58f92218c2fce589cf1cc85c05d7004ff8533d8 Mon Sep 17 00:00:00 2001 From: frantuma Date: Wed, 2 Feb 2022 13:48:39 +0100 Subject: [PATCH] update swagger-generator-v3 base docker image and java --- modules/swagger-generator/Dockerfile | 5 ++++- modules/swagger-generator/Dockerfile_root | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/swagger-generator/Dockerfile b/modules/swagger-generator/Dockerfile index 0c7c2c2a570..59e5c6c6538 100644 --- a/modules/swagger-generator/Dockerfile +++ b/modules/swagger-generator/Dockerfile @@ -1,4 +1,7 @@ -FROM openjdk:8-jre-alpine +FROM ubuntu:22.04 +ENV JAVA_HOME=/opt/java/openjdk +COPY --from=eclipse-temurin:8u322-b06-jre $JAVA_HOME $JAVA_HOME +ENV PATH="${JAVA_HOME}/bin:${PATH}" WORKDIR /jetty_home COPY docker/jetty /jetty_home/ diff --git a/modules/swagger-generator/Dockerfile_root b/modules/swagger-generator/Dockerfile_root index 2a63f9c2db4..f59712e0251 100644 --- a/modules/swagger-generator/Dockerfile_root +++ b/modules/swagger-generator/Dockerfile_root @@ -1,4 +1,7 @@ -FROM openjdk:8-jre-alpine +FROM ubuntu:22.04 +ENV JAVA_HOME=/opt/java/openjdk +COPY --from=eclipse-temurin:8u322-b06-jre $JAVA_HOME $JAVA_HOME +ENV PATH="${JAVA_HOME}/bin:${PATH}" WORKDIR /jetty_home COPY docker/jetty /jetty_home/