From ee0b162ece998f11ae356753e6107c2fc8a4abfc Mon Sep 17 00:00:00 2001 From: "Matteo Franci a.k.a. Fugerit" Date: Thu, 27 Feb 2025 22:37:42 +0100 Subject: [PATCH] Use UBI9 based Quarkus micro image for quarkus 3 #298 --- .../quarkus-3-gradle-kts/src/main/docker/Dockerfile.jvm | 2 +- .../src/main/docker/Dockerfile.legacy-jar | 2 +- .../quarkus-3-gradle-kts/src/main/docker/Dockerfile.native | 2 +- .../src/main/docker/Dockerfile.native-micro | 2 +- .../flavour/quarkus-3-gradle/src/main/docker/Dockerfile.jvm | 2 +- .../quarkus-3-gradle/src/main/docker/Dockerfile.legacy-jar | 2 +- .../quarkus-3-gradle/src/main/docker/Dockerfile.native | 2 +- .../src/main/docker/Dockerfile.native-micro | 2 +- .../config/flavour/quarkus-3/src/main/docker/Dockerfile.jvm | 5 +++-- .../flavour/quarkus-3/src/main/docker/Dockerfile.legacy-jar | 5 +++-- .../flavour/quarkus-3/src/main/docker/Dockerfile.native | 6 ++++-- .../quarkus-3/src/main/docker/Dockerfile.native-micro | 6 ++++-- fj-doc-native-quarkus/src/main/docker/Dockerfile.jvm | 5 +++-- fj-doc-native-quarkus/src/main/docker/Dockerfile.legacy-jar | 5 +++-- fj-doc-native-quarkus/src/main/docker/Dockerfile.native | 6 ++++-- .../src/main/docker/Dockerfile.native-micro | 6 ++++-- fj-doc-playground-quarkus/Dockerfile | 2 +- 17 files changed, 37 insertions(+), 25 deletions(-) diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle-kts/src/main/docker/Dockerfile.jvm b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle-kts/src/main/docker/Dockerfile.jvm index 731162bae..05a0e1957 100644 --- a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle-kts/src/main/docker/Dockerfile.jvm +++ b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle-kts/src/main/docker/Dockerfile.jvm @@ -77,7 +77,7 @@ # accessed directly. (example: "foo.example.com,bar.example.com") # ### -FROM registry.access.redhat.com/ubi8/openjdk-21:1.20 +FROM registry.access.redhat.com/ubi9/openjdk-21:1.21 ENV LANGUAGE='en_US:en' diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle-kts/src/main/docker/Dockerfile.legacy-jar b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle-kts/src/main/docker/Dockerfile.legacy-jar index 2202bba51..9963effbe 100644 --- a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle-kts/src/main/docker/Dockerfile.legacy-jar +++ b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle-kts/src/main/docker/Dockerfile.legacy-jar @@ -77,7 +77,7 @@ # accessed directly. (example: "foo.example.com,bar.example.com") # ### -FROM registry.access.redhat.com/ubi8/openjdk-21:1.20 +FROM registry.access.redhat.com/ubi9/openjdk-21:1.21 ENV LANGUAGE='en_US:en' diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle-kts/src/main/docker/Dockerfile.native b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle-kts/src/main/docker/Dockerfile.native index 608711fd2..df0eb841b 100644 --- a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle-kts/src/main/docker/Dockerfile.native +++ b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle-kts/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/fj-doc-quarkus-tutorial # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10 +FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle-kts/src/main/docker/Dockerfile.native-micro b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle-kts/src/main/docker/Dockerfile.native-micro index a1d6795b3..9761caf08 100644 --- a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle-kts/src/main/docker/Dockerfile.native-micro +++ b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle-kts/src/main/docker/Dockerfile.native-micro @@ -17,7 +17,7 @@ # docker run -i --rm -p 8080:8080 quarkus/fj-doc-quarkus-tutorial # ### -FROM quay.io/quarkus/quarkus-micro-image:2.0 +FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle/src/main/docker/Dockerfile.jvm b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle/src/main/docker/Dockerfile.jvm index 731162bae..05a0e1957 100644 --- a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle/src/main/docker/Dockerfile.jvm +++ b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle/src/main/docker/Dockerfile.jvm @@ -77,7 +77,7 @@ # accessed directly. (example: "foo.example.com,bar.example.com") # ### -FROM registry.access.redhat.com/ubi8/openjdk-21:1.20 +FROM registry.access.redhat.com/ubi9/openjdk-21:1.21 ENV LANGUAGE='en_US:en' diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle/src/main/docker/Dockerfile.legacy-jar b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle/src/main/docker/Dockerfile.legacy-jar index 2202bba51..9963effbe 100644 --- a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle/src/main/docker/Dockerfile.legacy-jar +++ b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle/src/main/docker/Dockerfile.legacy-jar @@ -77,7 +77,7 @@ # accessed directly. (example: "foo.example.com,bar.example.com") # ### -FROM registry.access.redhat.com/ubi8/openjdk-21:1.20 +FROM registry.access.redhat.com/ubi9/openjdk-21:1.21 ENV LANGUAGE='en_US:en' diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle/src/main/docker/Dockerfile.native b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle/src/main/docker/Dockerfile.native index 608711fd2..df0eb841b 100644 --- a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle/src/main/docker/Dockerfile.native +++ b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/fj-doc-quarkus-tutorial # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10 +FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle/src/main/docker/Dockerfile.native-micro b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle/src/main/docker/Dockerfile.native-micro index a1d6795b3..9761caf08 100644 --- a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle/src/main/docker/Dockerfile.native-micro +++ b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3-gradle/src/main/docker/Dockerfile.native-micro @@ -17,7 +17,7 @@ # docker run -i --rm -p 8080:8080 quarkus/fj-doc-quarkus-tutorial # ### -FROM quay.io/quarkus/quarkus-micro-image:2.0 +FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3/src/main/docker/Dockerfile.jvm b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3/src/main/docker/Dockerfile.jvm index 074e687ea..8a52f341f 100644 --- a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3/src/main/docker/Dockerfile.jvm +++ b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3/src/main/docker/Dockerfile.jvm @@ -26,7 +26,8 @@ # This scripts computes the command line to execute your Java application, and # includes memory/GC tuning. # You can configure the behavior using the following environment properties: -# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") +# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") - Be aware that this will override +# the default JVM options, use `JAVA_OPTS_APPEND` to append options # - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options # in JAVA_OPTS (example: "-Dsome.property=foo") # - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is @@ -77,7 +78,7 @@ # accessed directly. (example: "foo.example.com,bar.example.com") # ### -FROM registry.access.redhat.com/ubi8/openjdk-21:1.20 +FROM registry.access.redhat.com/ubi9/openjdk-21:1.21 ENV LANGUAGE='en_US:en' diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3/src/main/docker/Dockerfile.legacy-jar b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3/src/main/docker/Dockerfile.legacy-jar index 57c5075e1..ec1e6b9f0 100644 --- a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3/src/main/docker/Dockerfile.legacy-jar +++ b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3/src/main/docker/Dockerfile.legacy-jar @@ -26,7 +26,8 @@ # This scripts computes the command line to execute your Java application, and # includes memory/GC tuning. # You can configure the behavior using the following environment properties: -# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") +# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") - Be aware that this will override +# the default JVM options, use `JAVA_OPTS_APPEND` to append options # - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options # in JAVA_OPTS (example: "-Dsome.property=foo") # - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is @@ -77,7 +78,7 @@ # accessed directly. (example: "foo.example.com,bar.example.com") # ### -FROM registry.access.redhat.com/ubi8/openjdk-21:1.20 +FROM registry.access.redhat.com/ubi9/openjdk-21:1.21 ENV LANGUAGE='en_US:en' diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3/src/main/docker/Dockerfile.native b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3/src/main/docker/Dockerfile.native index 92eadde3c..de63bc41e 100644 --- a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3/src/main/docker/Dockerfile.native +++ b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3/src/main/docker/Dockerfile.native @@ -13,13 +13,15 @@ # # docker run -i --rm -p 8080:8080 quarkus/getting-started # +# The ` registry.access.redhat.com/ubi9/ubi-minimal:9.5` base image is based on UBI 9. +# To use UBI 8, switch to `quay.io/ubi8/ubi-minimal:8.10`. ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10 +FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ && chown 1001:root /work -COPY --chown=1001:root target/*-runner /work/application +COPY --chown=1001:root --chmod=0755 target/*-runner /work/application EXPOSE 8080 USER 1001 diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3/src/main/docker/Dockerfile.native-micro b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3/src/main/docker/Dockerfile.native-micro index 6bc8c11a4..2ac1875bd 100644 --- a/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3/src/main/docker/Dockerfile.native-micro +++ b/fj-doc-maven-plugin/src/main/resources/config/flavour/quarkus-3/src/main/docker/Dockerfile.native-micro @@ -16,13 +16,15 @@ # # docker run -i --rm -p 8080:8080 quarkus/getting-started # +# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9. +# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`. ### -FROM quay.io/quarkus/quarkus-micro-image:2.0 +FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ && chown 1001:root /work -COPY --chown=1001:root target/*-runner /work/application +COPY --chown=1001:root --chmod=0755 target/*-runner /work/application EXPOSE 8080 USER 1001 diff --git a/fj-doc-native-quarkus/src/main/docker/Dockerfile.jvm b/fj-doc-native-quarkus/src/main/docker/Dockerfile.jvm index 074e687ea..8a52f341f 100644 --- a/fj-doc-native-quarkus/src/main/docker/Dockerfile.jvm +++ b/fj-doc-native-quarkus/src/main/docker/Dockerfile.jvm @@ -26,7 +26,8 @@ # This scripts computes the command line to execute your Java application, and # includes memory/GC tuning. # You can configure the behavior using the following environment properties: -# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") +# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") - Be aware that this will override +# the default JVM options, use `JAVA_OPTS_APPEND` to append options # - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options # in JAVA_OPTS (example: "-Dsome.property=foo") # - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is @@ -77,7 +78,7 @@ # accessed directly. (example: "foo.example.com,bar.example.com") # ### -FROM registry.access.redhat.com/ubi8/openjdk-21:1.20 +FROM registry.access.redhat.com/ubi9/openjdk-21:1.21 ENV LANGUAGE='en_US:en' diff --git a/fj-doc-native-quarkus/src/main/docker/Dockerfile.legacy-jar b/fj-doc-native-quarkus/src/main/docker/Dockerfile.legacy-jar index 57c5075e1..ec1e6b9f0 100644 --- a/fj-doc-native-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/fj-doc-native-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -26,7 +26,8 @@ # This scripts computes the command line to execute your Java application, and # includes memory/GC tuning. # You can configure the behavior using the following environment properties: -# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") +# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") - Be aware that this will override +# the default JVM options, use `JAVA_OPTS_APPEND` to append options # - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options # in JAVA_OPTS (example: "-Dsome.property=foo") # - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is @@ -77,7 +78,7 @@ # accessed directly. (example: "foo.example.com,bar.example.com") # ### -FROM registry.access.redhat.com/ubi8/openjdk-21:1.20 +FROM registry.access.redhat.com/ubi9/openjdk-21:1.21 ENV LANGUAGE='en_US:en' diff --git a/fj-doc-native-quarkus/src/main/docker/Dockerfile.native b/fj-doc-native-quarkus/src/main/docker/Dockerfile.native index 92eadde3c..de63bc41e 100644 --- a/fj-doc-native-quarkus/src/main/docker/Dockerfile.native +++ b/fj-doc-native-quarkus/src/main/docker/Dockerfile.native @@ -13,13 +13,15 @@ # # docker run -i --rm -p 8080:8080 quarkus/getting-started # +# The ` registry.access.redhat.com/ubi9/ubi-minimal:9.5` base image is based on UBI 9. +# To use UBI 8, switch to `quay.io/ubi8/ubi-minimal:8.10`. ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10 +FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ && chown 1001:root /work -COPY --chown=1001:root target/*-runner /work/application +COPY --chown=1001:root --chmod=0755 target/*-runner /work/application EXPOSE 8080 USER 1001 diff --git a/fj-doc-native-quarkus/src/main/docker/Dockerfile.native-micro b/fj-doc-native-quarkus/src/main/docker/Dockerfile.native-micro index 6bc8c11a4..2ac1875bd 100644 --- a/fj-doc-native-quarkus/src/main/docker/Dockerfile.native-micro +++ b/fj-doc-native-quarkus/src/main/docker/Dockerfile.native-micro @@ -16,13 +16,15 @@ # # docker run -i --rm -p 8080:8080 quarkus/getting-started # +# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9. +# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`. ### -FROM quay.io/quarkus/quarkus-micro-image:2.0 +FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ && chown 1001:root /work -COPY --chown=1001:root target/*-runner /work/application +COPY --chown=1001:root --chmod=0755 target/*-runner /work/application EXPOSE 8080 USER 1001 diff --git a/fj-doc-playground-quarkus/Dockerfile b/fj-doc-playground-quarkus/Dockerfile index a926e1da8..c683b7558 100644 --- a/fj-doc-playground-quarkus/Dockerfile +++ b/fj-doc-playground-quarkus/Dockerfile @@ -11,7 +11,7 @@ # docker image tag [image tag] fugeritorg/fj-doc-playground-quarkus:latest # # Change with any base openjdk image is preferred -FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.21-1.1739376167 +FROM registry.access.redhat.com/ubi9/openjdk-21:1.21 LABEL org.opencontainers.image.authors="Fugerit" \ org.opencontainers.image.source="Quarkus" \