This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git
commit 6e5b2401c1364f1cc2d3b3b732e493976c167062 Author: James Netherton <[email protected]> AuthorDate: Mon Sep 14 14:39:05 2026 +0100 Make refresh-dockerfiles.sh pass javaVersion argument to consistently set OpenJDK container base image --- aws-lambda/src/main/docker/Dockerfile.jvm | 2 +- aws-lambda/src/main/docker/Dockerfile.legacy-jar | 2 +- fhir/src/main/docker/Dockerfile.jvm | 2 +- fhir/src/main/docker/Dockerfile.legacy-jar | 2 +- kafka/src/main/docker/Dockerfile.jvm | 2 +- kafka/src/main/docker/Dockerfile.legacy-jar | 2 +- observability/src/main/docker/Dockerfile.jvm | 2 +- observability/src/main/docker/Dockerfile.legacy-jar | 2 +- refresh-dockerfiles.sh | 6 +++++- 9 files changed, 13 insertions(+), 9 deletions(-) diff --git a/aws-lambda/src/main/docker/Dockerfile.jvm b/aws-lambda/src/main/docker/Dockerfile.jvm index 1911b978..63b0796f 100644 --- a/aws-lambda/src/main/docker/Dockerfile.jvm +++ b/aws-lambda/src/main/docker/Dockerfile.jvm @@ -96,7 +96,7 @@ # You can find more information about the UBI base runtime images and their configuration here: # https://rh-openjdk.github.io/redhat-openjdk-containers/ ### -FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24 +FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24 ENV LANGUAGE='en_US:en' diff --git a/aws-lambda/src/main/docker/Dockerfile.legacy-jar b/aws-lambda/src/main/docker/Dockerfile.legacy-jar index cbefb892..ef931e72 100644 --- a/aws-lambda/src/main/docker/Dockerfile.legacy-jar +++ b/aws-lambda/src/main/docker/Dockerfile.legacy-jar @@ -96,7 +96,7 @@ # You can find more information about the UBI base runtime images and their configuration here: # https://rh-openjdk.github.io/redhat-openjdk-containers/ ### -FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24 +FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24 ENV LANGUAGE='en_US:en' diff --git a/fhir/src/main/docker/Dockerfile.jvm b/fhir/src/main/docker/Dockerfile.jvm index 4d1103e0..97e8d927 100644 --- a/fhir/src/main/docker/Dockerfile.jvm +++ b/fhir/src/main/docker/Dockerfile.jvm @@ -96,7 +96,7 @@ # You can find more information about the UBI base runtime images and their configuration here: # https://rh-openjdk.github.io/redhat-openjdk-containers/ ### -FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24 +FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24 ENV LANGUAGE='en_US:en' diff --git a/fhir/src/main/docker/Dockerfile.legacy-jar b/fhir/src/main/docker/Dockerfile.legacy-jar index eef6c7d4..a72c1c83 100644 --- a/fhir/src/main/docker/Dockerfile.legacy-jar +++ b/fhir/src/main/docker/Dockerfile.legacy-jar @@ -96,7 +96,7 @@ # You can find more information about the UBI base runtime images and their configuration here: # https://rh-openjdk.github.io/redhat-openjdk-containers/ ### -FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24 +FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24 ENV LANGUAGE='en_US:en' diff --git a/kafka/src/main/docker/Dockerfile.jvm b/kafka/src/main/docker/Dockerfile.jvm index a042480b..457c006d 100644 --- a/kafka/src/main/docker/Dockerfile.jvm +++ b/kafka/src/main/docker/Dockerfile.jvm @@ -96,7 +96,7 @@ # You can find more information about the UBI base runtime images and their configuration here: # https://rh-openjdk.github.io/redhat-openjdk-containers/ ### -FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24 +FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24 ENV LANGUAGE='en_US:en' diff --git a/kafka/src/main/docker/Dockerfile.legacy-jar b/kafka/src/main/docker/Dockerfile.legacy-jar index 3d51ff56..439dfca3 100644 --- a/kafka/src/main/docker/Dockerfile.legacy-jar +++ b/kafka/src/main/docker/Dockerfile.legacy-jar @@ -96,7 +96,7 @@ # You can find more information about the UBI base runtime images and their configuration here: # https://rh-openjdk.github.io/redhat-openjdk-containers/ ### -FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24 +FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24 ENV LANGUAGE='en_US:en' diff --git a/observability/src/main/docker/Dockerfile.jvm b/observability/src/main/docker/Dockerfile.jvm index f213a3f7..42ede85d 100644 --- a/observability/src/main/docker/Dockerfile.jvm +++ b/observability/src/main/docker/Dockerfile.jvm @@ -96,7 +96,7 @@ # You can find more information about the UBI base runtime images and their configuration here: # https://rh-openjdk.github.io/redhat-openjdk-containers/ ### -FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24 +FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24 ENV LANGUAGE='en_US:en' diff --git a/observability/src/main/docker/Dockerfile.legacy-jar b/observability/src/main/docker/Dockerfile.legacy-jar index 2c3b4cfe..7e33b627 100644 --- a/observability/src/main/docker/Dockerfile.legacy-jar +++ b/observability/src/main/docker/Dockerfile.legacy-jar @@ -96,7 +96,7 @@ # You can find more information about the UBI base runtime images and their configuration here: # https://rh-openjdk.github.io/redhat-openjdk-containers/ ### -FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24 +FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24 ENV LANGUAGE='en_US:en' diff --git a/refresh-dockerfiles.sh b/refresh-dockerfiles.sh index 2f14941c..671a79f0 100755 --- a/refresh-dockerfiles.sh +++ b/refresh-dockerfiles.sh @@ -27,6 +27,9 @@ QUARKUS_MAVEN_PLUGIN_VERSION=$("$PROJECT_ROOT/mvnw" -f timer-log/pom.xml help:ev QUARKUS_MAVEN_PLUGIN_GROUP_ID=$("$PROJECT_ROOT/mvnw" -f timer-log/pom.xml help:evaluate -Dexpression=quarkus.platform.group-id -q -DforceStdout) QUARKUS_MAVEN_PLUGIN_ARTIFACT_ID="quarkus-maven-plugin" +# The java version used in the generated JVM mode Dockerfile +JAVA_VERSION=21 + if [ -z "$QUARKUS_MAVEN_PLUGIN_VERSION" ] || [ -z "$QUARKUS_MAVEN_PLUGIN_GROUP_ID" ] || [ -z "$QUARKUS_MAVEN_PLUGIN_ARTIFACT_ID" ]; then echo "Error: Could not extract all Quarkus platform properties from timer-log/pom.xml" exit 1 @@ -46,7 +49,8 @@ echo "Generating temporary Quarkus project with Quarkus Maven Plugin..." -DprojectGroupId=org.acme \ -DprojectArtifactId=temp-quarkus-project \ -DnoCode=true \ - -Dextensions="resteasy-reactive" + -Dextensions="resteasy-reactive" \ + -DjavaVersion=${JAVA_VERSION} if [ $? -ne 0 ]; then echo "Error: Quarkus project generation failed."
