Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update main (stable) branch #36

Merged
merged 2 commits into from
Sep 15, 2023
Merged

Update main (stable) branch #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da3d3e9
Merge pull request #35 from mjanez/main
mjanez Sep 15, 2023
9b5b4ee
Add matrix to docker action
mjanez Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docker-pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down