From b87280265c1a28c730d77022f118097d716d6716 Mon Sep 17 00:00:00 2001 From: zxbu <32785355+zxbu@users.noreply.github.com> Date: Sat, 24 Jul 2021 11:56:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=94=AF=E6=8C=81=20linux/arm/v6=20linux/a?= =?UTF-8?q?rm/v7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 09e18b5..30bd032 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 + platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 push: ${{ github.event_name != 'pull_request' }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache From abbcc0816860891a7ed8a0cac499f147b10cdc23 Mon Sep 17 00:00:00 2001 From: zxbu <32785355+zxbu@users.noreply.github.com> Date: Sat, 24 Jul 2021 11:57:54 +0800 Subject: [PATCH 2/5] linux/arm/v7 --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 30bd032..9c733f0 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,linux/arm/v6 + platforms: linux/amd64,linux/arm64,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 From 8bffa83ce9c5bb947f7c1265f1702f707ec8d114 Mon Sep 17 00:00:00 2001 From: zxbu <32785355+zxbu@users.noreply.github.com> Date: Sat, 24 Jul 2021 12:08:13 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=99=8D=E7=BA=A7jdk8=EF=BC=8C=E6=94=AF?= =?UTF-8?q?=E6=8C=81=20armv6=20armv7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" From f707d1e32e8c433320926f90f0e792cdf7b4b02b Mon Sep 17 00:00:00 2001 From: zxbu <32785355+zxbu@users.noreply.github.com> Date: Sat, 24 Jul 2021 12:09:02 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=94=AF=E6=8C=81=20linux/arm/v7=20linux/a?= =?UTF-8?q?rm/v6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From f52c1816eb7e9edd545ac9764962ba90682b42ff Mon Sep 17 00:00:00 2001 From: zxbu <32785355+zxbu@users.noreply.github.com> Date: Sat, 24 Jul 2021 12:31:28 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=94=AF=E6=8C=81=20linux/arm/v7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d26339d..9c733f0 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/v6,linux/arm/v7 + platforms: linux/amd64,linux/arm64,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