Fix metadata actions

mjanez · Sep 15, 2023 · 0744939 · 0744939
1 parent 9b5b4ee
commit 0744939
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/docker-pr.yaml b/.github/workflows/docker-pr.yaml
@@ -4,7 +4,6 @@ on:
   pull_request:
     branches:
       - main
-      - stable
       - latest
 
 env:
@@ -35,17 +34,18 @@ jobs:
         id: meta
         uses: docker/metadata-action@v4
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+            images: ${{ matrix.image }}
+            labels: |
+              org.opencontainers.image.documentation=https://github.com/${{ github.repository }}/blob/${{ env.BRANCH }}/README.md
+              org.opencontainers.image.version=${{ env.BRANCH }}
 
       - name: Build to test
         uses: docker/build-push-action@v5
         id: docker-push
         with:
           push: false
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.BRANCH }}
-          labels: |
-            ${{ steps.meta.outputs.labels }}
-            org.opencontainers.image.documentation=https://github.com/${{ github.repository }}/blob/${{ env.BRANCH }}/README.md
+          labels: ${{ steps.meta.outputs.labels }}
           context: ${{ env.CONTEXT }}
           file: ${{ env.CONTEXT }}${{ env.DOCKERFILE_PATH }}/${{ env.DOCKERFILE }}
 

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -1,12 +1,14 @@
 name: Build and push ckan-pycsw image
 
 on:
+  push:
+    branches:
+      - main
   pull_request:
     types:
       - closed
     branches:
       - main
-      - stable
       - latest
 
 env:
@@ -51,15 +53,16 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: ${{ matrix.image }}
+          labels: |
+            org.opencontainers.image.documentation=https://github.com/${{ github.repository }}/blob/${{ env.BRANCH }}/README.md
+            org.opencontainers.image.version=${{ env.BRANCH }}
 
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
           push: true
           tags: ${{ matrix.tag }}
-          labels: |
-            ${{ steps.meta.outputs.labels }}
-            org.opencontainers.image.documentation=https://github.com/${{ github.repository }}/blob/${{ env.BRANCH }}/README.md
+          labels: ${{ steps.meta.outputs.labels }}
           context: ${{ env.CONTEXT }}
           file: ${{ matrix.dockerfile }}