From ff0ad54ce5780cbee288f757e04a86ae4054cdde Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Tue, 7 Jan 2020 06:49:30 +0100 Subject: [PATCH 1/2] [java][quarkus] update to version 1.1.0.Final --- .../spec/libraries/quarkus/Dockerfile.jvm.mustache | 13 ++++++++----- .../quarkus/application.properties.mustache | 1 + .../JavaJaxRS/spec/libraries/quarkus/pom.mustache | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/Dockerfile.jvm.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/Dockerfile.jvm.mustache index 08c75ecbaaa9..5c0779580f7e 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/Dockerfile.jvm.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/Dockerfile.jvm.mustache @@ -14,18 +14,21 @@ # docker run -i --rm -p 8080:8080 quarkus/{{artifactId}}-jvm # ### -FROM fabric8/java-alpine-openjdk8-jre +FROM fabric8/java-alpine-openjdk8-jre:1.6.5 ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" ENV AB_ENABLED=jmx_exporter -COPY target/lib/* /deployments/lib/ -COPY target/*-runner.jar /deployments/app.jar -EXPOSE 8080 -# run with user 1001 and be prepared for be running in OpenShift too +# Be prepared for running in OpenShift too RUN adduser -G root --no-create-home --disabled-password 1001 \ && chown -R 1001 /deployments \ && chmod -R "g+rwX" /deployments \ && chown -R 1001:root /deployments + +COPY target/lib/* /deployments/lib/ +COPY target/*-runner.jar /deployments/app.jar +EXPOSE 8080 + +# run with user 1001 USER 1001 ENTRYPOINT [ "/deployments/run-java.sh" ] \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/application.properties.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/application.properties.mustache index cef6b5176182..959a92cb4b7d 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/application.properties.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/application.properties.mustache @@ -1,3 +1,4 @@ # Configuration file +# key = value mp.openapi.scan.disable=true \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/pom.mustache index df616018ae0f..50d609c759d5 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/pom.mustache @@ -13,10 +13,10 @@ 1.8 UTF-8 UTF-8 - 1.0.1.Final + 1.1.0.Final quarkus-universe-bom io.quarkus - 1.0.1.Final + 1.1.0.Final 2.22.1 From ff1986a9d6a6e86ecaf0d8cde463f8a43f62c44d Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Wed, 8 Jan 2020 08:34:11 +0100 Subject: [PATCH 2/2] [java][quarkus] update to version 1.1.1.Final --- .../resources/JavaJaxRS/spec/libraries/quarkus/pom.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/pom.mustache index 50d609c759d5..e741d85fe97b 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/pom.mustache @@ -13,10 +13,10 @@ 1.8 UTF-8 UTF-8 - 1.1.0.Final + 1.1.1.Final quarkus-universe-bom io.quarkus - 1.1.0.Final + 1.1.1.Final 2.22.1