From 74662ae58b752837cc714468958ecdd9c696500a Mon Sep 17 00:00:00 2001
From: ljw <84855512@qq.com>
Date: Fri, 27 Sep 2024 17:32:25 +0800
Subject: [PATCH] up build docker

---
 .github/workflows/build.yml | 35 ++++++++---------------------------
 Dockerfile                  |  2 ++
 2 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9d1c4ae..0932ba3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -119,13 +119,9 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
 
-      - name: Get git tag
+      - name: Extract version from tag
         id: vars
-        run: |
-          T=${GITHUB_REF#refs/*/}
-          M=${T%%.*}
-          echo "GIT_TAG=$T" >> $GITHUB_ENV
-          echo "MAJOR_TAG=$M" >> $GITHUB_ENV
+        run: echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
@@ -154,8 +150,7 @@ jobs:
             ARCH=${{ matrix.job.docker_platform }}
           tags: |
             lejianwen/rustdesk-api:latest-${{ matrix.job.platform }}
-            lejianwen/rustdesk-api:${{ env.GIT_TAG }}-${{ matrix.job.platform }}
-            lejianwen/rustdesk-api:${{ env.MAJOR_TAG }}-${{ matrix.job.platform }}
+            lejianwen/rustdesk-api:${{ env.TAG }}-${{ matrix.job.platform }}
           labels: ${{ steps.meta.outputs.labels }}
 
   docker-manifest:
@@ -163,9 +158,9 @@ jobs:
     needs: docker
     runs-on: ubuntu-latest
     steps:
-#      - name: Extract version from tag
-#        id: vars
-#        run: echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+      - name: Extract version from tag
+        id: vars
+        run: echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
 
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
@@ -173,25 +168,11 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
 
-      - name: Get git tag
-        id: vars
-        run: |
-          T=${GITHUB_REF#refs/*/}
-          M=${T%%.*}
-          echo "GIT_TAG=$T" >> $GITHUB_ENV
-          echo "MAJOR_TAG=$M" >> $GITHUB_ENV
-
       - name: Create and push manifest (:version)
         uses: Noelware/docker-manifest-action@master
         with:
-          base-image: lejianwen/rustdesk-api:${{ env.GIT_TAG }}
-          extra-images: lejianwen/rustdesk-api:${{ env.GIT_TAG }}-amd64,lejianwen/rustdesk-api:${{ env.GIT_TAG }}-arm64
-          push: true
-      - name: Create and push manifest (:MAJOR_TAG)
-        uses: Noelware/docker-manifest-action@master
-        with:
-          base-image: lejianwen/rustdesk-api:${{ env.MAJOR_TAG }}
-          extra-images: lejianwen/rustdesk-api:${{ env.MAJOR_TAG }}-amd64,lejianwen/rustdesk-api:${{ env.MAJOR_TAG }}-arm64
+          base-image: lejianwen/rustdesk-api:${{ env.TAG }}
+          extra-images: lejianwen/rustdesk-api:${{ env.TAG }}-amd64,lejianwen/rustdesk-api:${{ env.TAG }}-arm64
           push: true
 
 #      - name: Create and push manifest (:latest)
diff --git a/Dockerfile b/Dockerfile
index 4f08cc8..919f3ae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
 FROM alpine
+
+ARG ARCH
 WORKDIR /app
 RUN apk add --no-cache tzdata
 COPY ./release /app/