Merge pull request #36 from mjanez/latest

Update main (stable) branch

.github/workflows/docker-pr.yaml

@@ -42,7 +42,7 @@ jobs:
         id: docker-push
         with:
           push: false
-          tags: ${{ steps.meta.outputs.tags }}
+          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

.github/workflows/docker.yaml

@@ -27,6 +27,7 @@ jobs:
       matrix:
         include:
           - image: ghcr.io/${{ github.repository }}
+            tag: ghcr.io/${{ github.repository }}:${{ github.head_ref }}
             dockerfile: ./ckan-pycsw/Dockerfile
     steps:
       - name: Set up QEMU
@@ -55,7 +56,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: ${{ matrix.tag }}
           labels: |
             ${{ steps.meta.outputs.labels }}
             org.opencontainers.image.documentation=https://github.com/${{ github.repository }}/blob/${{ env.BRANCH }}/README.md
@@ -65,12 +66,12 @@ jobs:
       - name: Linting Dockerfile with hadolint in GH Actions
         uses: hadolint/[email protected]
         with:
-          dockerfile: ${{ env.CONTEXT }}${{ env.DOCKERFILE_PATH }}/${{ env.DOCKERFILE }}
+          dockerfile: ${{ matrix.dockerfile }}
 
       - name: Run Trivy container image vulnerability scanner
         uses: aquasecurity/[email protected]
         with:
-          image-ref: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.BRANCH }}
+          image-ref: ${{ matrix.tag }}
           format: sarif
           output: trivy-results.sarif