From b23a9bde8e0e2f07cc2ed3fd601d0e75330b2a80 Mon Sep 17 00:00:00 2001 From: lejianwen <84855512@qq.com> Date: Fri, 25 Apr 2025 16:20:36 +0800 Subject: [PATCH] chore: Noelware/docker-manifest-action --- .github/workflows/build.yml | 36 ++++++++++++++++---------------- .github/workflows/build_test.yml | 12 +++++------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4189768..c9788b1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -380,20 +380,20 @@ jobs: - name: Create and push manifest Docker Hub (:version) if: ${{ env.SKIP_DOCKER_HUB == 'false' }} - uses: Noelware/docker-manifest-action@master + uses: Noelware/docker-manifest-action@v0.2.3 with: - inputs: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }} - tags: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64, + base-image: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }} + extra-images: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64, ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-armv7l, ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64 push: true - name: Create and push manifest GHCR (:version) if: ${{ env.SKIP_GHCR == 'false' }} - uses: Noelware/docker-manifest-action@master + uses: Noelware/docker-manifest-action@v0.2.3 with: - inputs: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }} - tags: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64, + base-image: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }} + extra-images: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64, ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-armv7l, ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64 push: true @@ -401,20 +401,20 @@ jobs: - name: Create and push manifest Docker Hub (:latest) if: ${{ env.SKIP_DOCKER_HUB == 'false' }} - uses: Noelware/docker-manifest-action@master + uses: Noelware/docker-manifest-action@v0.2.3 with: - inputs: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:latest - tags: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:latest-amd64, + base-image: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:latest + extra-images: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:latest-amd64, ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:latest-armv7l, ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:latest-arm64 push: true - name: Create and push manifest GHCR (:latest) if: ${{ env.SKIP_GHCR == 'false' }} - uses: Noelware/docker-manifest-action@master + uses: Noelware/docker-manifest-action@v0.2.3 with: - inputs: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:latest - tags: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:latest-amd64, + base-image: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:latest + extra-images: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:latest-amd64, ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:latest-armv7l, ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:latest-arm64 push: true @@ -422,10 +422,10 @@ jobs: - name: Create and push Full S6 manifest Docker Hub (:version) if: ${{ env.SKIP_DOCKER_HUB == 'false' }} - uses: Noelware/docker-manifest-action@master + uses: Noelware/docker-manifest-action@v0.2.3 with: - inputs: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:full-s6 - tags: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-amd64, + base-image: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:full-s6 + extra-images: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-amd64, ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-armv7l, ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-arm64 push: true @@ -433,10 +433,10 @@ jobs: - name: Create and push Full S6 manifest GHCR (:latest) if: ${{ env.SKIP_GHCR == 'false' }} - uses: Noelware/docker-manifest-action@master + uses: Noelware/docker-manifest-action@v0.2.3 with: - inputs: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:full-s6 - tags: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-amd64, + base-image: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:full-s6 + extra-images: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-amd64, ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-armv7l, ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:full-s6-arm64 push: true diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 06a60a3..5a6d282 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -317,20 +317,20 @@ jobs: - name: Create and push manifest Docker Hub (:version) if: ${{ env.SKIP_DOCKER_HUB == 'false' }} - uses: Noelware/docker-manifest-action@master + uses: Noelware/docker-manifest-action@v0.2.3 with: - inputs: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }} - tags: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64, + base-image: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }} + extra-images: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64, ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-armv7l, ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64 push: true - name: Create and push manifest GHCR (:version) if: ${{ env.SKIP_GHCR == 'false' }} - uses: Noelware/docker-manifest-action@master + uses: Noelware/docker-manifest-action@v0.2.3 with: - inputs: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }} - tags: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64, + base-image: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }} + extra-images: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64, ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-armv7l, ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64 push: true