Make Dockerfile work for uber-jar as well

Author: stuartwdouglas

src/main/docker/Dockerfile.jvm.staged

@@ -29,13 +29,18 @@ 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 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/
-RUN echo "copyhack" > /build/target/copyhack 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085 
+# if this is an uber jar create a structure that looks the same as fast-jar with empty directories
+# this allows for the same dockerfile to be used with both
+RUN if [ ! -d /build/target/quarkus-app ] ; then mkdir -p /build/target/quarkus-app/lib; \
+     mkdir -p /build/target/quarkus-app/app; \
+     mkdir -p /build/target/quarkus-app/quarkus; \
+     mv /build/target/$(cat .env-id)-$(cat .env-version)*.jar /build/target/quarkus-app/ ; \
+     fi
+
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085
 
 ARG JAVA_PACKAGE=java-17-openjdk-devel
 ARG RUN_JAVA_VERSION=1.3.8
@@ -57,14 +62,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/copyhack /build/target/quarkus-app-tmp/*.jar /deployments/export-run-artifact.jar
-COPY --from=0 --chown=1001 /build/target/copyhack /build/target/*quarkus-app/*lib/ /deployments/lib/
-# Overwrite the uber jar if package type is normal
-COPY --from=0 --chown=1001 /build/target/copyhack /build/target/*quarkus-app/*.jar /deployments/export-run-artifact.jar 
-COPY --from=0 --chown=1001 /build/target/copyhack /build/target/*quarkus-app/*app/ /deployments/app/
-COPY --from=0 --chown=1001 /build/target/copyhack /build/target/*quarkus-app/*quarkus/ /deployments/quarkus/
+COPY --from=0 --chown=1001 /build/target/*quarkus-app/lib/ /deployments/lib/
+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
 
-ENTRYPOINT [ "/deployments/run-java.sh" ]
+ENTRYPOINT [ "/deployments/run-java.sh" ]