Merge pull request #15 from sinlov-opensource/master

👷 to support platform `linux/arm/v7`
Update docker-build-release.yml
2023-04-25 22:04:55 +08:00 · 2023-04-25 18:02:45 +08:00 · 2023-04-25 17:56:25 +08:00 · 2023-04-25 17:49:06 +08:00 · 2023-04-25 17:22:14 +08:00
3 changed files with 15 additions and 7 deletions
--- 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
@ -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
--- a/8
+++ b/8
@ -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 \
--- 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}
Author	SHA1	Message	Date
Stille	39f8ccfba1	Merge pull request #15 from sinlov-opensource/master 👷 to support platform `linux/arm/v7`	2023-04-25 22:04:55 +08:00
sinlov	2a64e753bf	Update docker-build-release.yml add latest to try support `linux/arm/v7`	2023-04-25 18:02:45 +08:00
sinlov	73c0009c16	Update frpc_linux_install.sh to support arm	2023-04-25 17:56:25 +08:00
sinlov	daf0c6f4c7	Update Dockerfile to support armv7	2023-04-25 17:49:06 +08:00
sinlov	04a0aca2f1	Update docker-build-release.yml to support platfomr `linux/arm/v7`	2023-04-25 17:22:14 +08:00