Fix context/paths of actions

mjanez · Sep 14, 2023 · 117b3a4 · 117b3a4
1 parent 0da7716
commit 117b3a4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/docker-dev.yaml b/.github/workflows/docker-dev.yaml
@@ -15,7 +15,8 @@ env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}-dev
   CONTEXT: .
-  DOCKERFILE: /ckan-pycsw/Dockerfile.dev
+  DOCKERFILE_PATH: /ckan-pycsw
+  DOCKERFILE: Dockerfile.dev
 
 jobs:
   docker:
@@ -52,12 +53,12 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           context: ${{ env.CONTEXT }}
-          file: ${{ env.DOCKERFILE }}
+          file: ${{ env.CONTEXT }}${{ env.DOCKERFILE_PATH }}/${{ env.DOCKERFILE }}
 
       - 
         name: Scan image
         uses: ISID/build-and-scan-image@v0.4.2
         with:
           tag: ${{ env.IMAGE_NAME }}
-          path: ${{ env.CONTEXT }}
+          path: ${{ env.CONTEXT }}${{ env.DOCKERFILE_PATH }}
           dockerfile: ${{ env.DOCKERFILE }}
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -15,7 +15,8 @@ env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
   CONTEXT: .
-  DOCKERFILE: /ckan-pycsw/Dockerfile
+  DOCKERFILE_PATH: /ckan-pycsw
+  DOCKERFILE: Dockerfile
 
 jobs:
   docker:
@@ -52,12 +53,12 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           context: ${{ env.CONTEXT }}
-          file: ${{ env.DOCKERFILE }}
+          file: ${{ env.CONTEXT }}${{ env.DOCKERFILE_PATH }}/${{ env.DOCKERFILE }}
 
       - 
         name: Scan image
         uses: ISID/build-and-scan-image@v0.4.2
         with:
           tag: ${{ env.IMAGE_NAME }}
-          path: ${{ env.CONTEXT }}
+          path: ${{ env.CONTEXT }}${{ env.DOCKERFILE_PATH }}
           dockerfile: ${{ env.DOCKERFILE }}