Browse Source

chore: Noelware/docker-manifest-action

lejianwen 9 months ago
parent
commit
b23a9bde8e
2 changed files with 24 additions and 24 deletions
  1. 18 18
      .github/workflows/build.yml
  2. 6 6
      .github/workflows/build_test.yml

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

@@ -380,20 +380,20 @@ jobs:
380 380
 
381 381
       - name: Create and push manifest Docker Hub (:version)
382 382
         if: ${{ env.SKIP_DOCKER_HUB == 'false' }}
383
-        uses: Noelware/docker-manifest-action@master
383
+        uses: Noelware/docker-manifest-action@v0.2.3
384 384
         with:
385
-          inputs: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}
386
-          tags: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64,
385
+          base-image: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}
386
+          extra-images: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64,
387 387
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-armv7l,
388 388
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64
389 389
           push: true
390 390
 
391 391
       - name: Create and push manifest GHCR (:version)
392 392
         if: ${{ env.SKIP_GHCR == 'false' }}
393
-        uses: Noelware/docker-manifest-action@master
393
+        uses: Noelware/docker-manifest-action@v0.2.3
394 394
         with:
395
-          inputs: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}
396
-          tags: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64,
395
+          base-image: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}
396
+          extra-images: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64,
397 397
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-armv7l,
398 398
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64
399 399
           push: true
@@ -401,20 +401,20 @@ jobs:
401 401
 
402 402
       - name: Create and push manifest Docker Hub (:latest)
403 403
         if: ${{ env.SKIP_DOCKER_HUB == 'false' }}
404
-        uses: Noelware/docker-manifest-action@master
404
+        uses: Noelware/docker-manifest-action@v0.2.3
405 405
         with:
406
-          inputs: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:latest
407
-          tags: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:latest-amd64,
406
+          base-image: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:latest
407
+          extra-images: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:latest-amd64,
408 408
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:latest-armv7l,
409 409
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:latest-arm64
410 410
           push: true
411 411
 
412 412
       - name: Create and push manifest GHCR (:latest)
413 413
         if: ${{ env.SKIP_GHCR == 'false' }}
414
-        uses: Noelware/docker-manifest-action@master
414
+        uses: Noelware/docker-manifest-action@v0.2.3
415 415
         with:
416
-          inputs: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:latest
417
-          tags: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:latest-amd64,
416
+          base-image: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:latest
417
+          extra-images: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:latest-amd64,
418 418
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:latest-armv7l,
419 419
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:latest-arm64
420 420
           push: true
@@ -422,10 +422,10 @@ jobs:
422 422
 
423 423
       - name: Create and push Full S6 manifest Docker Hub (:version)
424 424
         if: ${{ env.SKIP_DOCKER_HUB == 'false' }}
425
-        uses: Noelware/docker-manifest-action@master
425
+        uses: Noelware/docker-manifest-action@v0.2.3
426 426
         with:
427
-          inputs: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:full-s6
428
-          tags: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-amd64,
427
+          base-image: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:full-s6
428
+          extra-images: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-amd64,
429 429
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-armv7l,
430 430
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-arm64
431 431
           push: true
@@ -433,10 +433,10 @@ jobs:
433 433
 
434 434
       - name: Create and push Full S6 manifest GHCR (:latest)
435 435
         if: ${{ env.SKIP_GHCR == 'false' }}
436
-        uses: Noelware/docker-manifest-action@master
436
+        uses: Noelware/docker-manifest-action@v0.2.3
437 437
         with:
438
-          inputs: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:full-s6
439
-          tags: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-amd64,
438
+          base-image: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:full-s6
439
+          extra-images: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-amd64,
440 440
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-armv7l,
441 441
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-arm64
442 442
           push: true

+ 6 - 6
.github/workflows/build_test.yml

@@ -317,20 +317,20 @@ jobs:
317 317
 
318 318
       - name: Create and push manifest Docker Hub (:version)
319 319
         if: ${{ env.SKIP_DOCKER_HUB == 'false' }}
320
-        uses: Noelware/docker-manifest-action@master
320
+        uses: Noelware/docker-manifest-action@v0.2.3
321 321
         with:
322
-          inputs: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}
323
-          tags: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64,
322
+          base-image: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}
323
+          extra-images: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64,
324 324
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-armv7l,
325 325
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64
326 326
           push: true
327 327
 
328 328
       - name: Create and push manifest GHCR (:version)
329 329
         if: ${{ env.SKIP_GHCR == 'false' }}
330
-        uses: Noelware/docker-manifest-action@master
330
+        uses: Noelware/docker-manifest-action@v0.2.3
331 331
         with:
332
-          inputs: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}
333
-          tags: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64,
332
+          base-image: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}
333
+          extra-images: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64,
334 334
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-armv7l,
335 335
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64
336 336
           push: true