From 6b5e5a504d4c375e08c3a4489ec8568344c97356 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 16 Mar 2023 12:09:48 +0100
Subject: [PATCH] updates

---
 .github/workflows/production-release-dockerhub.yml |  2 +-
 .github/workflows/production-release.yml           | 11 +++++++++--
 .github/workflows/release-candidate.yml            |  2 +-
 .github/workflows/staging-release-dockerhub.yml    |  2 +-
 .github/workflows/staging-release.yml              |  2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/production-release-dockerhub.yml b/.github/workflows/production-release-dockerhub.yml
index 0a0ccf089..0ffe330eb 100644
--- a/.github/workflows/production-release-dockerhub.yml
+++ b/.github/workflows/production-release-dockerhub.yml
@@ -1,4 +1,4 @@
-name: production-release
+name: Production Release to DockerHub
 
 on:
   release:
diff --git a/.github/workflows/production-release.yml b/.github/workflows/production-release.yml
index a519f8a47..fb8fcd713 100644
--- a/.github/workflows/production-release.yml
+++ b/.github/workflows/production-release.yml
@@ -1,4 +1,4 @@
-name: production-release
+name: Production Release to ghcr.io
 
 on:
   release:
@@ -29,6 +29,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=semver,pattern={{version}}
       - name: Build and push
         uses: docker/build-push-action@v3
         with:
@@ -57,6 +59,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=semver,pattern={{version}}
       - name: Build and push
         uses: docker/build-push-action@v3
         with:
@@ -86,9 +90,12 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=semver,pattern={{version}}
       - name: Create & publish manifest
         run: |
-          docker buildx imagetools create --append ${{ steps.meta.outputs.tags }}-aarch64 --tag ${{ steps.meta.outputs.tags }}
+          docker buildx imagetools create --append ${{ fromJSON(steps.meta.outputs.json).tags[0] }}-aarch64 --tag ${{ fromJSON(steps.meta.outputs.json).tags[0] }}
+          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:
diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml
index ecb5dd1fc..e69dd009c 100644
--- a/.github/workflows/release-candidate.yml
+++ b/.github/workflows/release-candidate.yml
@@ -1,4 +1,4 @@
-name: release-candidate
+name: Release Candidate to ghcr.io
 
 on:
   release:
diff --git a/.github/workflows/staging-release-dockerhub.yml b/.github/workflows/staging-release-dockerhub.yml
index 008c00151..36dd332cf 100644
--- a/.github/workflows/staging-release-dockerhub.yml
+++ b/.github/workflows/staging-release-dockerhub.yml
@@ -1,4 +1,4 @@
-name: staging-release
+name: Staging Release to DockerHub
 
 on:
   push:
diff --git a/.github/workflows/staging-release.yml b/.github/workflows/staging-release.yml
index 2d18c2c98..15d3e5393 100644
--- a/.github/workflows/staging-release.yml
+++ b/.github/workflows/staging-release.yml
@@ -1,4 +1,4 @@
-name: staging-release
+name: Staging Release to ghcr.io
 
 on:
   push: