Generalize Dockerfile cmds to handle uber jar

Signed-off-by: Maysun J Faisal <[email protected]>

Author: maysunfaisal

src/main/docker/Dockerfile.jvm.staged

@@ -27,6 +27,13 @@ RUN mvn dependency:go-offline
 COPY src src
 RUN mvn package -Dmaven.test.skip=true
 
+RUN mkdir -p /build/target/quarkus-app-tmp
+RUN grep version /build/target/maven-archiver/pom.properties | cut -d '=' -f2 >.env-version 
+RUN grep artifactId /build/target/maven-archiver/pom.properties | cut -d '=' -f2 >.env-id
+
+# mv the uber jar in case the quarkus property quarkus.package.type=uber-jar is set
+RUN mv /build/target/$(cat .env-id)-$(cat .env-version)*.jar /build/target/quarkus-app-tmp/
+
 FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085 
 
 ARG JAVA_PACKAGE=java-17-openjdk-devel
@@ -49,10 +56,12 @@ RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \
 # 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 -Dquarkus.http.port=8081 -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 --from=0 --chown=1001 /build/target/quarkus-app/lib/ /deployments/lib/
-COPY --from=0 --chown=1001 /build/target/quarkus-app/*.jar /deployments/
-COPY --from=0 --chown=1001 /build/target/quarkus-app/app/ /deployments/app/
-COPY --from=0 --chown=1001 /build/target/quarkus-app/quarkus/ /deployments/quarkus/
+COPY --from=0 --chown=1001 /build/target/quarkus-app-tmp/*.jar /deployments/export-run-artifact.jar
+COPY --from=0 --chown=1001 /build/target/*quarkus-app/*lib/ /deployments/lib/
+# Overwrite the uber jar if package type is normal
+COPY --from=0 --chown=1001 /build/target/*quarkus-app/*.jar /deployments/export-run-artifact.jar 
+COPY --from=0 --chown=1001 /build/target/*quarkus-app/*app/ /deployments/app/
+COPY --from=0 --chown=1001 /build/target/*quarkus-app/*quarkus/ /deployments/quarkus/
 
 EXPOSE 8081
 USER 1001