From 04a0aca2f157bc5f2503d255886ca342f0a421c7 Mon Sep 17 00:00:00 2001 From: sinlov Date: Tue, 25 Apr 2023 17:22:14 +0800 Subject: [PATCH 1/4] Update docker-build-release.yml to support platfomr `linux/arm/v7` --- .github/workflows/docker-build-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-release.yml b/.github/workflows/docker-build-release.yml index 6ae72f6..7714fea 100644 --- a/.github/workflows/docker-build-release.yml +++ b/.github/workflows/docker-build-release.yml @@ -65,7 +65,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7 push: true tags: | ${{ secrets.HARBOR_REGISTRY }}/${{ secrets.HARBOR_USERNAME }}/${{ env.PROJECT }}:latest From daf0c6f4c7e7476a1068aecfda8728c7a561c775 Mon Sep 17 00:00:00 2001 From: sinlov Date: Tue, 25 Apr 2023 17:49:06 +0800 Subject: [PATCH 2/4] Update Dockerfile to support armv7 --- Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 46c8295..5dce836 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,8 +9,12 @@ RUN apk add --no-cache tzdata \ && ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime \ && echo ${TZ} > /etc/timezone -RUN if [ "$(uname -m)" = "x86_64" ]; then export PLATFORM=amd64 ; else if [ "$(uname -m)" = "aarch64" ]; then export PLATFORM=arm64 ; fi fi \ - && wget --no-check-certificate https://github.com/fatedier/frp/releases/download/v${VERSION}/frp_${VERSION}_linux_${PLATFORM}.tar.gz \ +RUN if [ "$(uname -m)" = "x86_64" ]; then export PLATFORM=amd64 ; \ + elif [ "$(uname -m)" = "aarch64" ]; then export PLATFORM=arm64 ; \ + elif [ "$(uname -m)" = "armv7" ]; then export PLATFORM=arm ; \ + elif [ "$(uname -m)" = "armv7l" ]; then export PLATFORM=arm ; \ + elif [ "$(uname -m)" = "armhf" ]; then export PLATFORM=arm ; fi \ + && wget --no-check-certificate https://github.com/fatedier/frp/releases/download/v${VERSION}/frp_${VERSION}_linux_${PLATFORM}.tar.gz \ && tar xzf frp_${VERSION}_linux_${PLATFORM}.tar.gz \ && cd frp_${VERSION}_linux_${PLATFORM} \ && mkdir /frp \ From 73c0009c16e55defa9f090b5a7ff0ee379f26463 Mon Sep 17 00:00:00 2001 From: sinlov Date: Tue, 25 Apr 2023 17:56:25 +0800 Subject: [PATCH 3/4] Update frpc_linux_install.sh to support arm --- frpc_linux_install.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/frpc_linux_install.sh b/frpc_linux_install.sh index ca08807..55d54a1 100755 --- a/frpc_linux_install.sh +++ b/frpc_linux_install.sh @@ -63,10 +63,14 @@ PROXY_HTTP_CODE=$(curl -o /dev/null --connect-timeout 5 --max-time 8 -s --head - # check arch if [ $(uname -m) = "x86_64" ]; then PLATFORM=amd64 -fi - -if [ $(uname -m) = "aarch64" ]; then +elif [ $(uname -m) = "aarch64" ]; then PLATFORM=arm64 +elif [ $(uname -m) = "armv7" ]; then + PLATFORM=arm +elif [ $(uname -m) = "armv7l" ]; then + PLATFORM=arm +elif [ $(uname -m) = "armhf" ]; then + PLATFORM=arm fi FILE_NAME=frp_${FRP_VERSION}_linux_${PLATFORM} From 2a64e753bfdc3496e3efd57ca4c8509df37aa5aa Mon Sep 17 00:00:00 2001 From: sinlov Date: Tue, 25 Apr 2023 18:02:45 +0800 Subject: [PATCH 4/4] Update docker-build-release.yml add latest to try support `linux/arm/v7` --- .github/workflows/docker-build-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-release.yml b/.github/workflows/docker-build-release.yml index 7714fea..abb1c00 100644 --- a/.github/workflows/docker-build-release.yml +++ b/.github/workflows/docker-build-release.yml @@ -40,7 +40,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7 push: true tags: | ${{ secrets.DOCKER_USERNAME }}/${{ env.PROJECT }}:latest