Browse Source

Merge remote-tracking branch 'origin/main' into main

main
zhouxin 4 years ago
parent
commit
410b742959
  1. 2
      .github/workflows/docker.yml
  2. 4
      Dockerfile

2
.github/workflows/docker.yml

@ -66,7 +66,7 @@ jobs:
with: with:
context: . context: .
file: ./Dockerfile file: ./Dockerfile
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64,linux/arm/v7
push: ${{ github.event_name != 'pull_request' }} push: ${{ github.event_name != 'pull_request' }}
cache-from: type=local,src=/tmp/.buildx-cache cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache

4
Dockerfile

@ -1,10 +1,10 @@
FROM maven:3.6.3-jdk-11 AS maven FROM maven:3-jdk-8-alpine AS maven
USER root USER root
COPY ./ /tmp/code COPY ./ /tmp/code
RUN cd /tmp/code && mvn clean package -Dmaven.test.skip=true -Dmaven.javadoc.skip=true 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 COPY --from=maven /tmp/code/target/*.jar /webdav.jar
EXPOSE 8080 EXPOSE 8080
ENV JAVA_OPTS="-Xmx1g" ENV JAVA_OPTS="-Xmx1g"

Loading…
Cancel
Save