ljw 1 год назад
Родитель
Сommit
8e026de20b
1 измененных файлов с 33 добавлено и 33 удалено
  1. 33 33
      .github/workflows/build.yml

+ 33 - 33
.github/workflows/build.yml

@@ -144,47 +144,47 @@ jobs:
144 144
           tar -xzf ${{ matrix.job.goos }}-${{ matrix.job.platform }}.tar.gz -C ${{ matrix.job.platform }}
145 145
           file ${{ matrix.job.platform }}/apimain
146 146
 
147
-      - name: Build and push Docker image
147
+      - name: Build and push Docker image ${{ matrix.job.platform }}
148 148
         uses: docker/build-push-action@v5
149 149
         with:
150 150
           context: "."
151 151
           file: ./Dockerfile
152
-          platforms: linux/amd64,linux/arm64
152
+          platforms: ${{ matrix.job.docker_platform }}
153 153
           push: true
154
-          #          provenance: false
154
+          provenance: false
155 155
           build-args: |
156 156
             BUILDARCH=${{ matrix.job.platform }}
157 157
           tags: |
158
-            lejianwen/rustdesk-api:${{ env.LATEST_TAG }}
159
-            lejianwen/rustdesk-api:${{ env.TAG }}
158
+            lejianwen/rustdesk-api:${{ env.LATEST_TAG }}-${{ matrix.job.platform }}
159
+            lejianwen/rustdesk-api:${{ env.TAG }}-${{ matrix.job.platform }}
160 160
           labels: ${{ steps.meta.outputs.labels }}
161 161
 
162 162
   #
163
-#  docker-manifest:
164
-#    name: Push Docker Manifest
165
-#    needs: docker
166
-#    runs-on: ubuntu-latest
167
-#    steps:
168
-#      - name: Extract version from tag
169
-#        id: vars
170
-#        run: echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
171
-#
172
-#      - name: Log in to Docker Hub
173
-#        uses: docker/login-action@v2
174
-#        with:
175
-#          username: ${{ secrets.DOCKER_USERNAME }}
176
-#          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
177
-#
178
-#      - name: Create and push manifest (:version)
179
-#        uses: Noelware/docker-manifest-action@master
180
-#        with:
181
-#          base-image: lejianwen/rustdesk-api:${{ env.TAG }}
182
-#          extra-images: lejianwen/rustdesk-api:${{ env.TAG }}-amd64,lejianwen/rustdesk-api:${{ env.TAG }}-arm64
183
-#          push: true
184
-
185
-#      - name: Create and push manifest (:latest)
186
-#        uses: Noelware/docker-manifest-action@master
187
-#        with:
188
-#          base-image: lejianwen/rustdesk-api:latest
189
-#          extra-images: lejianwen/rustdesk-api:latest-amd64,lejianwen/rustdesk-api:latest-arm64
190
-#          push: true
163
+  docker-manifest:
164
+    name: Push Docker Manifest
165
+    needs: docker
166
+    runs-on: ubuntu-latest
167
+    steps:
168
+      - name: Extract version from tag
169
+        id: vars
170
+        run: echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
171
+
172
+      - name: Log in to Docker Hub
173
+        uses: docker/login-action@v2
174
+        with:
175
+          username: ${{ secrets.DOCKER_USERNAME }}
176
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
177
+
178
+      - name: Create and push manifest (:version)
179
+        uses: Noelware/docker-manifest-action@master
180
+        with:
181
+          base-image: lejianwen/rustdesk-api:${{ env.TAG }}
182
+          extra-images: lejianwen/rustdesk-api:${{ env.TAG }}-amd64,lejianwen/rustdesk-api:${{ env.TAG }}-arm64
183
+          push: true
184
+
185
+      - name: Create and push manifest (:latest)
186
+        uses: Noelware/docker-manifest-action@master
187
+        with:
188
+          base-image: lejianwen/rustdesk-api:latest
189
+          extra-images: lejianwen/rustdesk-api:latest-amd64,lejianwen/rustdesk-api:latest-arm64
190
+          push: true