Update multiarch.yml

derskythe · May 10, 2024 · c871742 · c871742
1 parent 25f5191
commit c871742
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/.github/workflows/multiarch.yml b/.github/workflows/multiarch.yml
@@ -14,6 +14,8 @@ on:
 env:
   IMAGE_NAME: zerotier
   STORAGE_DRIVER: overlay
+  DOCKER_REGISTRY: docker://docker.io/derskythe
+  GHCR_REGISTRY: docker://ghcr.io/derskythe
 
 jobs:
   build:
@@ -97,19 +99,16 @@ jobs:
       - name: Push unstable images
         if: ${{ github.event_name == 'push' }}
         run: |
-          buildah manifest push --all --format v2s2 --creds zyclonite:${{ secrets.REGISTRY_PASSWORD }} ${{ env.IMAGE_NAME }}:latest docker://docker.io/zyclonite/${{ env.IMAGE_NAME }}:main
-          buildah manifest push --all --creds zyclonite:${{ secrets.QUAY_PASSWORD }} ${{ env.IMAGE_NAME }}:latest docker://quay.io/zyclonite/${{ env.IMAGE_NAME }}:main
-          buildah manifest push --all --creds zyclonite:${{ secrets.GITHUB_TOKEN }} ${{ env.IMAGE_NAME }}:latest docker://ghcr.io/zyclonite/${{ env.IMAGE_NAME }}:main
+          buildah manifest push --all --format v2s2 --creds ${{ github.actor }}:${{ secrets.DOCKER_PASS }} ${{ env.IMAGE_NAME }}:latest ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:main
+          buildah manifest push --all --creds ${{ github.actor }}:${{ secrets.GITHUB_TOKEN }} ${{ env.IMAGE_NAME }}:latest ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}:main
 
       - name: Push stable images
         if: ${{ github.event_name == 'release' }}
         run: |
-          buildah manifest push --all --format v2s2 --creds zyclonite:${{ secrets.REGISTRY_PASSWORD }} ${{ env.IMAGE_NAME }}:latest docker://docker.io/zyclonite/${{ env.IMAGE_NAME }}:latest
-          buildah manifest push --all --format v2s2 --creds zyclonite:${{ secrets.REGISTRY_PASSWORD }} ${{ env.IMAGE_NAME }}:latest docker://docker.io/zyclonite/${{ env.IMAGE_NAME }}:${{ github.event.release.tag_name }}
-          buildah manifest push --all --creds zyclonite:${{ secrets.QUAY_PASSWORD }} ${{ env.IMAGE_NAME }}:latest docker://quay.io/zyclonite/${{ env.IMAGE_NAME }}:latest
-          buildah manifest push --all --creds zyclonite:${{ secrets.QUAY_PASSWORD }} ${{ env.IMAGE_NAME }}:latest docker://quay.io/zyclonite/${{ env.IMAGE_NAME }}:${{ github.event.release.tag_name }}
-          buildah manifest push --all --creds zyclonite:${{ secrets.GITHUB_TOKEN }} ${{ env.IMAGE_NAME }}:latest docker://ghcr.io/zyclonite/${{ env.IMAGE_NAME }}:latest
-          buildah manifest push --all --creds zyclonite:${{ secrets.GITHUB_TOKEN }} ${{ env.IMAGE_NAME }}:latest docker://ghcr.io/zyclonite/${{ env.IMAGE_NAME }}:${{ github.event.release.tag_name }}
+          buildah manifest push --all --format v2s2 --creds ${{ github.actor }}:${{ secrets.DOCKER_PASS }} ${{ env.IMAGE_NAME }}:latest ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          buildah manifest push --all --format v2s2 --creds ${{ github.actor }}:${{ secrets.DOCKER_PASS }} ${{ env.IMAGE_NAME }}:latest ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.event.release.tag_name }}
+          buildah manifest push --all --creds ${{ github.actor }}:${{ secrets.GITHUB_TOKEN }} ${{ env.IMAGE_NAME }}:latest ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          buildah manifest push --all --creds ${{ github.actor }}:${{ secrets.GITHUB_TOKEN }} ${{ env.IMAGE_NAME }}:latest ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.event.release.tag_name }}
 
   router:
     uses: ./.github/workflows/router.yml