Skip to content

Commit

Permalink
Merge pull request #46 from entur/docs/update-examples
Browse files Browse the repository at this point in the history
docs: cleaned up docs for v2
  • Loading branch information
cvaskinn authored Oct 15, 2024
2 parents d20d722 + a533441 commit 778ee1e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/code-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ jobs:
category: 'scan-results'

get-repository-languages:
if: github.event_name == 'pull_request' || (github.event_name == 'push' && needs.upload-scan-reports-from-matching-pr.outputs.skip_job_and_continue_scan == 'True')
if: needs.upload-scan-reports-from-matching-pr.outputs.skip_job_and_continue_scan == 'True'
runs-on: ubuntu-latest
needs: upload-scan-reports-from-matching-pr
outputs:
Expand Down
8 changes: 5 additions & 3 deletions README-code-scan.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,15 @@ on:
push:
branches:
- main
paths-ignore:
- '**/README.md'
schedule:
- cron: "0 3 * * MON"
jobs:
code-scan:
name: Code Scan
uses: entur/gha-security/.github/workflows/code-scan.yml@v1
uses: entur/gha-security/.github/workflows/code-scan.yml@v2
secrets: inherit
```

Expand All @@ -73,7 +75,7 @@ name: "CodeQL"
jobs:
code-scan:
name: Code Scan
uses: entur/gha-security/.github/workflows/code-scan.yml@v1
uses: entur/gha-security/.github/workflows/code-scan.yml@v2
secrets: inherit
with:
use_setup_gradle: true
Expand Down Expand Up @@ -145,7 +147,7 @@ The OPTIONAL `allowlist` field MUST be a list of vulnerabilities that you want t
#### Example

```yaml
apiVersion: entur.io/v1alpha1
apiVersion: entur.io/securitytools/v1
kind: CodeScanConfig
metadata:
id: myprojectconfig
Expand Down
10 changes: 6 additions & 4 deletions README-docker-scan.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Add the following step to your workflow configuration:
jobs:
docker-scan:
name: Docker Scan
uses: entur/gha-security/.github/workflows/docker-scan.yml@v1
uses: entur/gha-security/.github/workflows/docker-scan.yml@v2
with:
image_artifact: # The name of the image artifact to scan

Expand All @@ -29,7 +29,7 @@ Go to the _Actions_ tab in your repository, click on _New workflow_ and select t

## Golden Path

- Docker image must be built before being scanned, preferably using reusable workflow `entur/gha-docker/.github/workflows/build.yml@v1`.
- Docker image must be built before being scanned, preferably using reusable workflow `entur/gha-docker/.github/workflows/build.yml@v2`.

### Example

Expand All @@ -53,6 +53,8 @@ on:
pull_request:
branches:
- "main"
ignore-paths:
- '**\README.md'

jobs:
docker-lint:
Expand Down Expand Up @@ -104,7 +106,7 @@ You can find documentation on how to create a fine-grained access token [here](h
jobs:
docker-scan:
needs: docker-build
uses: entur/gha-security/.github/workflows/docker-scan.yml@v1
uses: entur/gha-security/.github/workflows/docker-scan.yml@v2
with:
image_artifact: ${{ needs.docker-build.outputs.image_artifact }}
secrets:
Expand Down Expand Up @@ -154,7 +156,7 @@ The OPTIONAL `allowlist` field MUST be a list of vulnerabilities that you want t
#### Example

```yaml
apiVersion: entur.io/v1alpha1
apiVersion: entur.io/securitytools/v1
kind: DockerScanConfig
metadata:
id: myprojectconfig
Expand Down

0 comments on commit 778ee1e

Please sign in to comment.