Revert to Quarkus default dockerfiles

Brutus5000 · Brutus5000 · commit dfc72a7b1798 · 2025-05-27T21:55:31.000+02:00
diff --git a/src/main/docker/Dockerfile.jvm b/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/ubi9/openjdk-21:1.22-1.1747241886
+FROM registry.access.redhat.com/ubi9/openjdk-21:1.22
 
 ENV LANGUAGE='en_US:en'
 
@@ -90,6 +91,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/src/main/docker/Dockerfile.legacy-jar b/src/main/docker/Dockerfile.legacy-jar
@@ -3,7 +3,7 @@
 #
 # Before building the container image run:
 #
-# ./gradlew build -Dquarkus.package.type=legacy-jar
+# ./gradlew build -Dquarkus.package.jar.type=legacy-jar
 #
 # Then, build the image with:
 #
@@ -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/ubi9/openjdk-21:1.22-1.1747241886
+FROM registry.access.redhat.com/ubi9/openjdk-21:1.22
 
 ENV LANGUAGE='en_US:en'
 
@@ -87,5 +88,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/src/main/docker/Dockerfile.native b/src/main/docker/Dockerfile.native
@@ -3,7 +3,7 @@
 #
 # Before building the container image run:
 #
-# ./gradlew build -Dquarkus.package.type=native
+# ./gradlew build -Dquarkus.native.enabled=true
 #
 # Then, build the image with:
 #
@@ -13,15 +13,17 @@
 #
 # docker run -i --rm -p 8080:8080 quarkus/user-service
 #
+# The ` registry.access.redhat.com/ubi8/ubi-minimal:8.10` 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/ubi9/ubi-minimal:9.6-1747218906
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \
     && chown 1001:root /work
-COPY --chown=1001:root build/*-runner /work/application
+COPY --chown=1001:root --chmod=0755 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/src/main/docker/Dockerfile.native-micro b/src/main/docker/Dockerfile.native-micro
@@ -6,7 +6,7 @@
 #
 # Before building the container image run:
 #
-# ./gradlew build -Dquarkus.package.type=native
+# ./gradlew build -Dquarkus.native.enabled=true
 #
 # Then, build the image with:
 #
@@ -16,15 +16,17 @@
 #
 # docker run -i --rm -p 8080:8080 quarkus/user-service
 #
+# The `quay.io/quarkus/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:3.0
+FROM quay.io/quarkus/quarkus-micro-image:2.0
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \
     && chown 1001:root /work
-COPY --chown=1001:root build/*-runner /work/application
+COPY --chown=1001:root --chmod=0755 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"]

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#`
`4`	`4`	`# Before building the container image run:`
`5`	`5`	`#`
`6`		`-# ./gradlew build -Dquarkus.package.type=native`
	`6`	`+# ./gradlew build -Dquarkus.native.enabled=true`
`7`	`7`	`#`
`8`	`8`	`# Then, build the image with:`
`9`	`9`	`#`
`@@ -13,15 +13,17 @@`
`13`	`13`	`#`
`14`	`14`	`# docker run -i --rm -p 8080:8080 quarkus/user-service`
`15`	`15`	`#`
	`16`	+# The ` registry.access.redhat.com/ubi8/ubi-minimal:8.10` base image is based on UBI 9.
	`17`	+# To use UBI 8, switch to `quay.io/ubi8/ubi-minimal:8.10`.
`16`	`18`	`###`
`17`		`-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6-1747218906`
	`19`	`+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10`
`18`	`20`	`WORKDIR /work/`
`19`	`21`	`RUN chown 1001 /work \`
`20`	`22`	`&& chmod "g+rwX" /work \`
`21`	`23`	`&& chown 1001:root /work`
`22`		`-COPY --chown=1001:root build/*-runner /work/application`
	`24`	`+COPY --chown=1001:root --chmod=0755 build/*-runner /work/application`
`23`	`25`
`24`	`26`	`EXPOSE 8080`
`25`	`27`	`USER 1001`
`26`	`28`
`27`		`-CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]`
	`29`	`+ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#`
`7`	`7`	`# Before building the container image run:`
`8`	`8`	`#`
`9`		`-# ./gradlew build -Dquarkus.package.type=native`
	`9`	`+# ./gradlew build -Dquarkus.native.enabled=true`
`10`	`10`	`#`
`11`	`11`	`# Then, build the image with:`
`12`	`12`	`#`
`@@ -16,15 +16,17 @@`
`16`	`16`	`#`
`17`	`17`	`# docker run -i --rm -p 8080:8080 quarkus/user-service`
`18`	`18`	`#`
	`19`	+# The `quay.io/quarkus/quarkus-micro-image:2.0` base image is based on UBI 9.
	`20`	+# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
`19`	`21`	`###`
`20`		`-FROM quay.io/quarkus/quarkus-micro-image:3.0`
	`22`	`+FROM quay.io/quarkus/quarkus-micro-image:2.0`
`21`	`23`	`WORKDIR /work/`
`22`	`24`	`RUN chown 1001 /work \`
`23`	`25`	`&& chmod "g+rwX" /work \`
`24`	`26`	`&& chown 1001:root /work`
`25`		`-COPY --chown=1001:root build/*-runner /work/application`
	`27`	`+COPY --chown=1001:root --chmod=0755 build/*-runner /work/application`
`26`	`28`
`27`	`29`	`EXPOSE 8080`
`28`	`30`	`USER 1001`
`29`	`31`
`30`		`-CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]`
	`32`	`+ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]`