diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 9c733f0..d26339d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -66,7 +66,7 @@ jobs: with: context: . file: ./Dockerfile - platforms: linux/amd64,linux/arm64,linux/arm/v7 + platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7 push: ${{ github.event_name != 'pull_request' }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache diff --git a/Dockerfile b/Dockerfile index 37a5e00..10a94c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM maven:3.6.3-jdk-11 AS maven +FROM maven:3-jdk-8-alpine AS maven USER root COPY ./ /tmp/code RUN cd /tmp/code && mvn clean package -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -FROM openjdk:11-jdk-oracle +FROM openjdk:8-jdk-alpine COPY --from=maven /tmp/code/target/*.jar /webdav.jar EXPOSE 8080 ENV JAVA_OPTS="-Xmx1g"