From 2ab9797e00ddc28c86e1f1bfd5952a0ebec42b66 Mon Sep 17 00:00:00 2001 From: ryuupendragon Date: Fri, 4 Jul 2025 14:27:53 +0530 Subject: [PATCH] Test --- .gitea/workflows/build.yaml | 19 +++++++++++++++++-- .gitea/workflows/merge.yaml | 4 +--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 5b519f4..8404e2b 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -9,7 +9,6 @@ jobs: matrix: config: - {arch: 'arm64'} - - {arch: 'amd64'} runs-on: ${{ matrix.config.arch == 'arm64' && 'ubuntu-arm64' || 'ubuntu-amd64' }} steps: - name: Checkout @@ -27,6 +26,22 @@ jobs: - name: Build and Push Docker images for all Container Registries uses: docker/build-push-action@v6 with: - tags: ${{ vars.DOCKERHUB_REPO }}:2.10.0-${{matrix.config.arch}} , ${{ vars.DOCKERHUB_REPO }}:latest-${{matrix.config.arch}} + tags: ${{ vars.DOCKERHUB_REPO }}:latest-${{matrix.config.arch}} file: Dockerfile push: true + + merge-docker-manifest: + runs-on: ubuntu-latest + needs: build + steps: + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ vars.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Create and push manifest images + uses: Noelware/docker-manifest-action@master # or use a pinned version in the Releases tab + with: + inputs: ${{ vars.DOCKERHUB_REPO }}:latest + images: ${{ vars.DOCKERHUB_REPO }}:latest-arm64 + push: true diff --git a/.gitea/workflows/merge.yaml b/.gitea/workflows/merge.yaml index c78bb80..9e70171 100644 --- a/.gitea/workflows/merge.yaml +++ b/.gitea/workflows/merge.yaml @@ -21,9 +21,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Create manifest images - run: docker manifest create ${{ vars.DOCKERHUB_REPO }}:latest \ - --amend ${{ vars.DOCKERHUB_REPO }}:latest-amd64 \ - --amend ${{ vars.DOCKERHUB_REPO }}:latest-arm64 + run: docker manifest create ${{ vars.DOCKERHUB_REPO }}:latest --amend ${{ vars.DOCKERHUB_REPO }}:latest-amd64 --amend ${{ vars.DOCKERHUB_REPO }}:latest-arm64 - name: Push manifest images run: docker manifest push --purge ${{ vars.DOCKERHUB_REPO }}:latest