From 9355034e897f8d8846b904eeeff131e3fa3c21b8 Mon Sep 17 00:00:00 2001 From: dersvenhesse Date: Fri, 25 Oct 2024 17:53:39 +0000 Subject: [PATCH] feat: update jdk to 21 in docker --- .hub.cli.dockerfile | 4 ++-- .hub.online.dockerfile | 4 ++-- Dockerfile | 2 +- run-in-docker.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.hub.cli.dockerfile b/.hub.cli.dockerfile index 5a3041dc1084..51a33daf3064 100644 --- a/.hub.cli.dockerfile +++ b/.hub.cli.dockerfile @@ -3,7 +3,7 @@ ## ## You can build _just_ this part with: ## docker --target builder -t container-name:builder -f .hub.cli.dockerfile . -FROM maven:3-eclipse-temurin-17 as builder +FROM maven:3-eclipse-temurin-21 as builder ENV GEN_DIR /opt/openapi-generator WORKDIR ${GEN_DIR} @@ -15,7 +15,7 @@ RUN mvn -B -am -pl "modules/openapi-generator-cli" package ## The final (release) image ## The resulting container here only needs the target jar ## and ca-certificates (to be able to query HTTPS hosted specs) -FROM eclipse-temurin:17-jre +FROM eclipse-temurin:21-jre ENV GEN_DIR /opt/openapi-generator diff --git a/.hub.online.dockerfile b/.hub.online.dockerfile index 1d0b3a4aeed6..4f256f3f7d58 100644 --- a/.hub.online.dockerfile +++ b/.hub.online.dockerfile @@ -3,7 +3,7 @@ ## ## You can build _just_ this part with: ## docker --target builder -t container-name:builder -f .hub.online.dockerfile . -FROM maven:3-eclipse-temurin-17 as builder +FROM maven:3-eclipse-temurin-21 as builder ENV GEN_DIR /opt/openapi-generator WORKDIR ${GEN_DIR} @@ -14,7 +14,7 @@ RUN mvn -B -am -pl "modules/openapi-generator-online" package ## The final (release) image ## The resulting container here only needs the target jar -FROM eclipse-temurin:17-jre +FROM eclipse-temurin:21-jre ENV GEN_DIR /opt/openapi-generator ENV TARGET_DIR /generator diff --git a/Dockerfile b/Dockerfile index 543bc169f06d..471e9ba797fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:3-eclipse-temurin-17 +FROM maven:3-eclipse-temurin-21 ENV GEN_DIR /opt/openapi-generator WORKDIR ${GEN_DIR} diff --git a/run-in-docker.sh b/run-in-docker.sh index 077a9c972a56..c102df775f5b 100755 --- a/run-in-docker.sh +++ b/run-in-docker.sh @@ -21,4 +21,4 @@ docker run --rm -it \ -v "${PWD}/CI/run-in-docker-settings.xml:/var/maven/.m2/settings.xml" \ -v "${maven_cache_repo}:/var/maven/.m2/repository" \ --entrypoint /gen/docker-entrypoint.sh \ - maven:3-eclipse-temurin-17 "$@" + maven:3-eclipse-temurin-21 "$@"