diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 525a0d3..c6b1f5a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: Production Release +name: Release on: push: branches: @@ -44,10 +44,9 @@ jobs: java-package: jdk # (jre, jdk, or jdk+fx) - defaults to jdk architecture: x64 # (x64 or x86) - defaults to x64 - # Install artifacts locally for the docker build - # Also runs unit/integration tests - - name: Install artifacts locally - run: mvn install + # Build with Maven + - name: Test + run: mvn test # Cache Docker layers diff --git a/docker/Dockerfile b/docker/Dockerfile index ef659ad..c2f17ec 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,13 +1,18 @@ ARG BASE_IMAGE=eclipse-temurin ARG JRE_VERSION=17-jdk + +FROM ${BASE_IMAGE}:${JRE_VERSION} as source +WORKDIR /build +COPY . /build/ +RUN ./mvnw clean package -DskipTests + FROM ${BASE_IMAGE}:${JRE_VERSION} as builder WORKDIR /build -COPY webapp/target/*-exec.jar app.jar +COPY --from=source /build/webapp/target/*-exec.jar app.jar RUN java -Djarmode=layertools -jar app.jar extract FROM ${BASE_IMAGE}:${JRE_VERSION} - USER root WORKDIR /app