Codestart modularize Dockerfiles bis

vsevel · Aug 16, 2024 · a66b3b7 · a66b3b7
1 parent 788a7b8
commit a66b3b7
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 52 deletions.
diff --git a/...in/resources/codestarts/quarkus/tooling/dockerfiles/base/Dockerfile-jar-copy.include.qute b/...in/resources/codestarts/quarkus/tooling/dockerfiles/base/Dockerfile-jar-copy.include.qute
diff --git a/...ources/codestarts/quarkus/tooling/dockerfiles/base/Dockerfile-jar-entrypoint.include.qute b/...ources/codestarts/quarkus/tooling/dockerfiles/base/Dockerfile-jar-entrypoint.include.qute
diff --git a/...ain/resources/codestarts/quarkus/tooling/dockerfiles/base/Dockerfile-jar-env.include.qute b/...ain/resources/codestarts/quarkus/tooling/dockerfiles/base/Dockerfile-jar-env.include.qute
diff --git a/...s/base/Dockerfile-jar-header.include.qute → ...kerfiles/base/Dockerfile-jar.include.qute b/...s/base/Dockerfile-jar-header.include.qute → ...kerfiles/base/Dockerfile-jar.include.qute
@@ -77,3 +77,27 @@
 # accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
+{#include Dockerfile-jar-from /}
+
+ENV LANGUAGE='en_US:en'
+
+{#if type == 'jvm'}
+# We make four distinct layers so if there are application changes the library layers can be re-used
+COPY --chown=185 {buildtool.build-dir}/quarkus-app/lib/ /deployments/lib/
+COPY --chown=185 {buildtool.build-dir}/quarkus-app/*.jar /deployments/
+COPY --chown=185 {buildtool.build-dir}/quarkus-app/app/ /deployments/app/
+COPY --chown=185 {buildtool.build-dir}/quarkus-app/quarkus/ /deployments/quarkus/
+{#else}
+COPY {buildtool.build-dir}/lib/* /deployments/lib/
+COPY {buildtool.build-dir}/*-runner.jar /deployments/quarkus-run.jar
+{/if}
+
+EXPOSE 8080
+USER 185
+{#if java.version == '11'}
+ENV AB_JOLOKIA_OFF=""
+{/if}
+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/...resources/codestarts/quarkus/tooling/dockerfiles/base/Dockerfile-native-body.include.qute b/...resources/codestarts/quarkus/tooling/dockerfiles/base/Dockerfile-native-body.include.qute
diff --git a/...ase/Dockerfile-native-header.include.qute → ...files/base/Dockerfile-native.include.qute b/...ase/Dockerfile-native-header.include.qute → ...files/base/Dockerfile-native.include.qute
@@ -19,3 +19,15 @@
 # docker run -i --rm -p 8080:8080 quarkus/{project.artifact-id}
 #
 ###
+{#include Dockerfile-native-from image=image /}
+
+WORKDIR /work/
+RUN chown 1001 /work \
+ && chmod "g+rwX" /work \
+ && chown 1001:root /work
+COPY --chown=1001:root {buildtool.build-dir}/*-runner /work/application
+
+EXPOSE 8080
+USER 1001
+
+ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
diff --git a/...urces/codestarts/quarkus/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.jvm b/...urces/codestarts/quarkus/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.jvm
@@ -1,6 +1,3 @@
-{#include Dockerfile-jar-header type='jvm' cmd=buildtool.cmd.package /}
-{#include Dockerfile-jar-from /}
-{#include Dockerfile-jar-env /}
-{#include Dockerfile-jar-copy type='jvm' /}
-{#include Dockerfile-jar-entrypoint /}
+{#include Dockerfile-jar type='jvm' cmd=buildtool.cmd.package /}
+
 
diff --git a/...odestarts/quarkus/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.legacy-jar b/...odestarts/quarkus/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.legacy-jar
@@ -1,5 +1 @@
-{#include Dockerfile-jar-header type='legacy-jar' cmd=buildtool.cmd.package-legacy-jar /}
-{#include Dockerfile-jar-from /}
-{#include Dockerfile-jar-env /}
-{#include Dockerfile-jar-copy type='legacy-jar' /}
-{#include Dockerfile-jar-entrypoint /}
+{#include Dockerfile-jar type='legacy-jar' cmd=buildtool.cmd.package-legacy-jar /}
diff --git a/...es/codestarts/quarkus/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.native b/...es/codestarts/quarkus/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.native
@@ -1,4 +1,3 @@
-{#include Dockerfile-native-header type='native' /}
-{#include Dockerfile-native-from image=dockerfile.native.from /}
-{#include Dockerfile-native-body /}
+{#include Dockerfile-native type='native' image=dockerfile.native.from /}
+
 
diff --git a/...estarts/quarkus/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.native-micro b/...estarts/quarkus/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.native-micro
@@ -1,3 +1,2 @@
-{#include Dockerfile-native-header type='native-micro' /}
-{#include Dockerfile-native-from image=dockerfile.native-micro.from /}
-{#include Dockerfile-native-body /}
+{#include Dockerfile-native type='native-micro' image=dockerfile.native-micro.from /}
+