Skip to content

Commit

Permalink
Fix context/paths of actions
Browse files Browse the repository at this point in the history
  • Loading branch information
mjanez committed Sep 14, 2023
1 parent 0da7716 commit 117b3a4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/docker-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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/[email protected]
with:
tag: ${{ env.IMAGE_NAME }}
path: ${{ env.CONTEXT }}
path: ${{ env.CONTEXT }}${{ env.DOCKERFILE_PATH }}
dockerfile: ${{ env.DOCKERFILE }}
7 changes: 4 additions & 3 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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/[email protected]
with:
tag: ${{ env.IMAGE_NAME }}
path: ${{ env.CONTEXT }}
path: ${{ env.CONTEXT }}${{ env.DOCKERFILE_PATH }}
dockerfile: ${{ env.DOCKERFILE }}

0 comments on commit 117b3a4

Please sign in to comment.