From 418005279dd4b7fc11b478d2a2296c099787f068 Mon Sep 17 00:00:00 2001 From: Nikita Karpuk Date: Sat, 2 Dec 2023 20:28:35 +0100 Subject: [PATCH] Quarkus: 3.6.0 --- quarkus-app/build.gradle | 4 ++-- quarkus-app/src/main/docker/Dockerfile.jvm | 6 ++++-- quarkus-app/src/main/docker/Dockerfile.legacy-jar | 6 ++++-- quarkus-app/src/main/docker/Dockerfile.native | 4 ++-- quarkus-app/src/main/docker/Dockerfile.native-micro | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/quarkus-app/build.gradle b/quarkus-app/build.gradle index a7ed943..4c8f62c 100644 --- a/quarkus-app/build.gradle +++ b/quarkus-app/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'io.quarkus' version '3.0.1.Final' + id 'io.quarkus' version '3.6.0' } // Values: ['jar', 'uber-jar', 'native', 'native-sources'] @@ -19,7 +19,7 @@ dependencies { annotationProcessor 'org.projectlombok:lombok:1.18.24' annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.3.Final' implementation project(":common-api") - implementation enforcedPlatform("io.quarkus.platform:quarkus-bom:3.0.1.Final") + implementation enforcedPlatform("io.quarkus.platform:quarkus-bom:3.6.0") implementation 'io.quarkus:quarkus-arc' implementation 'io.quarkus:quarkus-resteasy-jackson' implementation 'io.quarkus:quarkus-rest-client-jackson' diff --git a/quarkus-app/src/main/docker/Dockerfile.jvm b/quarkus-app/src/main/docker/Dockerfile.jvm index 0a9d59d..c65c4dd 100644 --- a/quarkus-app/src/main/docker/Dockerfile.jvm +++ b/quarkus-app/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-17:1.14 +FROM registry.access.redhat.com/ubi8/openjdk-17:1.18 ENV LANGUAGE='en_US:en' @@ -90,6 +90,8 @@ COPY --chown=185 build/quarkus-app/quarkus/ /deployments/quarkus/ EXPOSE 8080 USER 185 -ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" +ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" ENV JAVA_APP_JAR="/deployments/quarkus-run.jar" +ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ] + diff --git a/quarkus-app/src/main/docker/Dockerfile.legacy-jar b/quarkus-app/src/main/docker/Dockerfile.legacy-jar index 9be9122..c6e7fbf 100644 --- a/quarkus-app/src/main/docker/Dockerfile.legacy-jar +++ b/quarkus-app/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-17:1.14 +FROM registry.access.redhat.com/ubi8/openjdk-17:1.18 ENV LANGUAGE='en_US:en' @@ -87,5 +87,7 @@ COPY build/*-runner.jar /deployments/quarkus-run.jar EXPOSE 8080 USER 185 -ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" +ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" ENV JAVA_APP_JAR="/deployments/quarkus-run.jar" + +ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ] diff --git a/quarkus-app/src/main/docker/Dockerfile.native b/quarkus-app/src/main/docker/Dockerfile.native index 126c613..1fc015a 100644 --- a/quarkus-app/src/main/docker/Dockerfile.native +++ b/quarkus-app/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/quarkus-app # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ @@ -24,4 +24,4 @@ COPY --chown=1001:root build/*-runner /work/application EXPOSE 8080 USER 1001 -CMD ["./application", "-Dquarkus.http.host=0.0.0.0"] +ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"] diff --git a/quarkus-app/src/main/docker/Dockerfile.native-micro b/quarkus-app/src/main/docker/Dockerfile.native-micro index 8f83c1e..183faf4 100644 --- a/quarkus-app/src/main/docker/Dockerfile.native-micro +++ b/quarkus-app/src/main/docker/Dockerfile.native-micro @@ -27,4 +27,4 @@ COPY --chown=1001:root build/*-runner /work/application EXPOSE 8080 USER 1001 -CMD ["./application", "-Dquarkus.http.host=0.0.0.0"] +ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]