diff --git a/.dockerignore b/.dockerignore index 3e2e201..c30e579 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,7 +1,6 @@ -# Maven — exclude all of target/ except quarkus-app/ (fast-jar output) +# Maven — exclude all of target/ except the uber-jar runner (quarkus.package.type=uber-jar) target/* -!target/quarkus-app -!target/quarkus-app/** +!target/*-runner.jar pom.xml.tag pom.xml.releaseBackup pom.xml.versionsBackup diff --git a/Dockerfile b/Dockerfile index 657a6ff..290621e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,10 @@ # Dockerfile for btpxpress-server -# Used by lionsctl pipeline. Expects `mvn clean package -Pprod` to have produced target/quarkus-app/ (fast-jar). +# Used by lionsctl pipeline. Expects `mvn clean package` to have produced target/*-runner.jar (uber-jar). FROM registry.access.redhat.com/ubi8/openjdk-21:1.21 ENV LANGUAGE='en_US:en' -COPY --chown=1001:1001 target/quarkus-app/lib/ /deployments/lib/ -COPY --chown=1001:1001 target/quarkus-app/*.jar /deployments/ -COPY --chown=1001:1001 target/quarkus-app/app/ /deployments/app/ -COPY --chown=1001:1001 target/quarkus-app/quarkus/ /deployments/quarkus/ +COPY --chown=1001:1001 target/*-runner.jar /deployments/app.jar USER 1001 @@ -18,4 +15,4 @@ ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss HEALTHCHECK --interval=30s --timeout=3s --start-period=30s --retries=3 \ CMD curl -f http://localhost:8080/q/health/live || exit 1 -ENTRYPOINT [ "java", "-jar", "/deployments/quarkus-run.jar" ] +ENTRYPOINT [ "java", "-jar", "/deployments/app.jar" ]