ljw 1 год назад
Родитель
Сommit
74662ae58b
2 измененных файлов с 10 добавлено и 27 удалено
  1. 8 27
      .github/workflows/build.yml
  2. 2 0
      Dockerfile

+ 8 - 27
.github/workflows/build.yml

@@ -119,13 +119,9 @@ jobs:
119
           username: ${{ secrets.DOCKER_USERNAME }}
119
           username: ${{ secrets.DOCKER_USERNAME }}
120
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
120
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
121
 
121
 
122
-      - name: Get git tag
122
+      - name: Extract version from tag
123
         id: vars
123
         id: vars
124
-        run: |
125
-          T=${GITHUB_REF#refs/*/}
126
-          M=${T%%.*}
127
-          echo "GIT_TAG=$T" >> $GITHUB_ENV
128
-          echo "MAJOR_TAG=$M" >> $GITHUB_ENV
124
+        run: echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
129
 
125
 
130
       - name: Extract metadata (tags, labels) for Docker
126
       - name: Extract metadata (tags, labels) for Docker
131
         id: meta
127
         id: meta
@@ -154,8 +150,7 @@ jobs:
154
             ARCH=${{ matrix.job.docker_platform }}
150
             ARCH=${{ matrix.job.docker_platform }}
155
           tags: |
151
           tags: |
156
             lejianwen/rustdesk-api:latest-${{ matrix.job.platform }}
152
             lejianwen/rustdesk-api:latest-${{ matrix.job.platform }}
157
-            lejianwen/rustdesk-api:${{ env.GIT_TAG }}-${{ matrix.job.platform }}
158
-            lejianwen/rustdesk-api:${{ env.MAJOR_TAG }}-${{ matrix.job.platform }}
153
+            lejianwen/rustdesk-api:${{ env.TAG }}-${{ matrix.job.platform }}
159
           labels: ${{ steps.meta.outputs.labels }}
154
           labels: ${{ steps.meta.outputs.labels }}
160
 
155
 
161
   docker-manifest:
156
   docker-manifest:
@@ -163,9 +158,9 @@ jobs:
163
     needs: docker
158
     needs: docker
164
     runs-on: ubuntu-latest
159
     runs-on: ubuntu-latest
165
     steps:
160
     steps:
166
-#      - name: Extract version from tag
167
-#        id: vars
168
-#        run: echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
161
+      - name: Extract version from tag
162
+        id: vars
163
+        run: echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
169
 
164
 
170
       - name: Log in to Docker Hub
165
       - name: Log in to Docker Hub
171
         uses: docker/login-action@v2
166
         uses: docker/login-action@v2
@@ -173,25 +168,11 @@ jobs:
173
           username: ${{ secrets.DOCKER_USERNAME }}
168
           username: ${{ secrets.DOCKER_USERNAME }}
174
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
169
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
175
 
170
 
176
-      - name: Get git tag
177
-        id: vars
178
-        run: |
179
-          T=${GITHUB_REF#refs/*/}
180
-          M=${T%%.*}
181
-          echo "GIT_TAG=$T" >> $GITHUB_ENV
182
-          echo "MAJOR_TAG=$M" >> $GITHUB_ENV
183
-
184
       - name: Create and push manifest (:version)
171
       - name: Create and push manifest (:version)
185
         uses: Noelware/docker-manifest-action@master
172
         uses: Noelware/docker-manifest-action@master
186
         with:
173
         with:
187
-          base-image: lejianwen/rustdesk-api:${{ env.GIT_TAG }}
188
-          extra-images: lejianwen/rustdesk-api:${{ env.GIT_TAG }}-amd64,lejianwen/rustdesk-api:${{ env.GIT_TAG }}-arm64
189
-          push: true
190
-      - name: Create and push manifest (:MAJOR_TAG)
191
-        uses: Noelware/docker-manifest-action@master
192
-        with:
193
-          base-image: lejianwen/rustdesk-api:${{ env.MAJOR_TAG }}
194
-          extra-images: lejianwen/rustdesk-api:${{ env.MAJOR_TAG }}-amd64,lejianwen/rustdesk-api:${{ env.MAJOR_TAG }}-arm64
174
+          base-image: lejianwen/rustdesk-api:${{ env.TAG }}
175
+          extra-images: lejianwen/rustdesk-api:${{ env.TAG }}-amd64,lejianwen/rustdesk-api:${{ env.TAG }}-arm64
195
           push: true
176
           push: true
196
 
177
 
197
 #      - name: Create and push manifest (:latest)
178
 #      - name: Create and push manifest (:latest)

+ 2 - 0
Dockerfile

@@ -1,4 +1,6 @@
1
 FROM alpine
1
 FROM alpine
2
+
3
+ARG ARCH
2
 WORKDIR /app
4
 WORKDIR /app
3
 RUN apk add --no-cache tzdata
5
 RUN apk add --no-cache tzdata
4
 COPY ./release /app/
6
 COPY ./release /app/