From 63f1f8e447c8e8dcf0053be016dab5ec4295f318 Mon Sep 17 00:00:00 2001 From: Rostislav Svoboda Date: Mon, 10 Oct 2022 11:01:35 +0200 Subject: [PATCH] Sync of changes in Dockerfiles with upstream https://github.com/quarkusio/quarkus/pull/28362 https://github.com/quarkusio/quarkus/commit/f335f7e084429d2744ff839e6273d64f017948eb https://github.com/quarkusio/quarkus/commit/79d7ed54b396fc045c5313a8fecd0175209bcec7 (cherry picked from commit d5e35f49476c3d0f8ab5040f4cf0b7e7c01a323f) --- docker-build/src/main/docker/Dockerfile.jvm | 11 +++++------ docker-build/src/main/docker/Dockerfile.native | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/docker-build/src/main/docker/Dockerfile.jvm b/docker-build/src/main/docker/Dockerfile.jvm index 0cc20ff9f..2b2f0b617 100644 --- a/docker-build/src/main/docker/Dockerfile.jvm +++ b/docker-build/src/main/docker/Dockerfile.jvm @@ -21,12 +21,10 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/openjdk-11-runtime:1.10 +FROM registry.access.redhat.com/ubi8/openjdk-11:1.14 -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' +ENV LANGUAGE='en_US:en' -# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size. -ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" # We make four distinct layers so if there are application changes the library layers can be re-used COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/ @@ -36,6 +34,7 @@ COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/ EXPOSE 8080 USER 185 - -ENTRYPOINT [ "java", "-jar", "/deployments/quarkus-run.jar" ] +ENV AB_JOLOKIA_OFF="" +ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" +ENV JAVA_APP_JAR="/deployments/quarkus-run.jar" diff --git a/docker-build/src/main/docker/Dockerfile.native b/docker-build/src/main/docker/Dockerfile.native index c92d00ba1..bc4399f20 100644 --- a/docker-build/src/main/docker/Dockerfile.native +++ b/docker-build/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \