Просмотр исходного кода

chore: Noelware/docker-manifest-action

lejianwen месяцев назад: 9
Родитель
Сommit
a87ae5cf65
2 измененных файлов с 16 добавлено и 16 удалено
  1. 12 12
      .github/workflows/build.yml
  2. 4 4
      .github/workflows/build_test.yml

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

@@ -382,8 +382,8 @@ jobs:
382
         if: ${{ env.SKIP_DOCKER_HUB == 'false' }}
382
         if: ${{ env.SKIP_DOCKER_HUB == 'false' }}
383
         uses: Noelware/docker-manifest-action@master
383
         uses: Noelware/docker-manifest-action@master
384
         with:
384
         with:
385
-          base-image: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}
386
-          extra-images: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64,
385
+          inputs: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}
386
+          tags: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64,
387
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-armv7l,
387
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-armv7l,
388
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64
388
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64
389
           push: true
389
           push: true
@@ -392,8 +392,8 @@ jobs:
392
         if: ${{ env.SKIP_GHCR == 'false' }}
392
         if: ${{ env.SKIP_GHCR == 'false' }}
393
         uses: Noelware/docker-manifest-action@master
393
         uses: Noelware/docker-manifest-action@master
394
         with:
394
         with:
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,
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,
397
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-armv7l,
397
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-armv7l,
398
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64
398
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64
399
           push: true
399
           push: true
@@ -403,8 +403,8 @@ jobs:
403
         if: ${{ env.SKIP_DOCKER_HUB == 'false' }}
403
         if: ${{ env.SKIP_DOCKER_HUB == 'false' }}
404
         uses: Noelware/docker-manifest-action@master
404
         uses: Noelware/docker-manifest-action@master
405
         with:
405
         with:
406
-          base-image: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:latest
407
-          extra-images: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:latest-amd64,
406
+          inputs: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:latest
407
+          tags: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:latest-amd64,
408
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:latest-armv7l,
408
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:latest-armv7l,
409
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:latest-arm64
409
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:latest-arm64
410
           push: true
410
           push: true
@@ -413,8 +413,8 @@ jobs:
413
         if: ${{ env.SKIP_GHCR == 'false' }}
413
         if: ${{ env.SKIP_GHCR == 'false' }}
414
         uses: Noelware/docker-manifest-action@master
414
         uses: Noelware/docker-manifest-action@master
415
         with:
415
         with:
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,
416
+          inputs: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:latest
417
+          tags: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:latest-amd64,
418
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:latest-armv7l,
418
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:latest-armv7l,
419
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:latest-arm64
419
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:latest-arm64
420
           push: true
420
           push: true
@@ -424,8 +424,8 @@ jobs:
424
         if: ${{ env.SKIP_DOCKER_HUB == 'false' }}
424
         if: ${{ env.SKIP_DOCKER_HUB == 'false' }}
425
         uses: Noelware/docker-manifest-action@master
425
         uses: Noelware/docker-manifest-action@master
426
         with:
426
         with:
427
-          base-image: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:full-s6
428
-          extra-images: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-amd64,
427
+          inputs: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:full-s6
428
+          tags: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-amd64,
429
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-armv7l,
429
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-armv7l,
430
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-arm64
430
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-arm64
431
           push: true
431
           push: true
@@ -435,8 +435,8 @@ jobs:
435
         if: ${{ env.SKIP_GHCR == 'false' }}
435
         if: ${{ env.SKIP_GHCR == 'false' }}
436
         uses: Noelware/docker-manifest-action@master
436
         uses: Noelware/docker-manifest-action@master
437
         with:
437
         with:
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,
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,
440
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-armv7l,
440
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-armv7l,
441
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-arm64
441
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-arm64
442
           push: true
442
           push: true

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

@@ -319,8 +319,8 @@ jobs:
319
         if: ${{ env.SKIP_DOCKER_HUB == 'false' }}
319
         if: ${{ env.SKIP_DOCKER_HUB == 'false' }}
320
         uses: Noelware/docker-manifest-action@master
320
         uses: Noelware/docker-manifest-action@master
321
         with:
321
         with:
322
-          base-image: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}
323
-          extra-images: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64,
322
+          inputs: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}
323
+          tags: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64,
324
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-armv7l,
324
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-armv7l,
325
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64
325
             ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64
326
           push: true
326
           push: true
@@ -329,8 +329,8 @@ jobs:
329
         if: ${{ env.SKIP_GHCR == 'false' }}
329
         if: ${{ env.SKIP_GHCR == 'false' }}
330
         uses: Noelware/docker-manifest-action@master
330
         uses: Noelware/docker-manifest-action@master
331
         with:
331
         with:
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,
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,
334
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-armv7l,
334
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-armv7l,
335
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64
335
             ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64
336
           push: true
336
           push: true