mod: tagging w/ docker

ospos-org · Aug 15, 2023 · 4305f7b · 4305f7b
1 parent 6888cdf
commit 4305f7b
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -28,6 +28,11 @@ jobs:
           uses: docker/setup-buildx-action@v2
           with:
             driver-opts: image=moby/buildkit:buildx-stable-1
+        - name: Extract Docker metadata
+          id: meta
+          uses: docker/metadata-action@v3
+          with:
+              images: ${{ env.REGISTRY }}/${{ env.REGISTRY_PATH }}/${{ env.SERVICE_NAME }}
         - name: Login to GCR
           if: github.event_name != 'pull_request'
           uses: docker/login-action@v1
@@ -41,7 +46,7 @@ jobs:
             context: .
             platforms: linux/amd64
             push: ${{ github.event_name != 'pull_request' }}
-            tags: ${{ env.REGISTRY }}/${{ env.REGISTRY_PATH }}/${{ env.SERVICE_NAME }}:latest
+            tags: ${{ steps.meta.outputs.tags }}
             labels: ${{ steps.meta.outputs.labels }}
 
   build-arm:
@@ -52,6 +57,11 @@ jobs:
           uses: docker/setup-buildx-action@v2
           with:
             driver-opts: image=moby/buildkit:buildx-stable-1
+        - name: Extract Docker metadata
+          id: meta
+          uses: docker/metadata-action@v3
+          with:
+              images: ${{ env.REGISTRY }}/${{ env.REGISTRY_PATH }}/${{ env.SERVICE_NAME }}
         - name: Login to GCR
           if: github.event_name != 'pull_request'
           uses: docker/login-action@v1
@@ -65,5 +75,6 @@ jobs:
             context: .
             platforms: linux/arm64
             push: ${{ github.event_name != 'pull_request' }}
-            tags: ${{ env.REGISTRY }}/${{ env.REGISTRY_PATH }}/${{ env.SERVICE_NAME }}:latest-arm
+            # ${{ env.REGISTRY }}/${{ env.REGISTRY_PATH }}/${{ env.SERVICE_NAME }}:latest-arm
+            tags: ${{ steps.meta.outputs.tags }}-arm
             labels: ${{ steps.meta.outputs.labels }}