Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into removing-explicit-tokens
Browse files Browse the repository at this point in the history
  • Loading branch information
flaxel committed Jun 6, 2023
2 parents 20a4adb + c05de46 commit a453a79
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/template_gitops.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ on:
docker-build-target:
required: false
type: string
docker-build-provenance:
required: false
type: string
default: 'false'
docker-file:
required: false
type: string
Expand Down Expand Up @@ -52,11 +56,12 @@ jobs:
uses: actions/checkout@v3

- name: GitOps (build, push and deploy a new Docker image)
uses: Staffbase/gitops-github-action@v5.1
uses: Staffbase/gitops-github-action@v5.2
with:
docker-username: ${{ secrets.docker-username }}
docker-password: ${{ secrets.docker-password }}
docker-build-args: ${{ inputs.docker-build-args }}
docker-build-provenance: ${{ inputs.docker-build-provenance }}
docker-build-target: ${{ inputs.docker-build-target }}
docker-build-secrets: ${{ secrets.docker-build-secrets }}
docker-build-secret-files: ${{ secrets.docker-build-secret-files }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/template_secret_scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fetch-depth: 0

- name: TruffleHog OSS
uses: trufflesecurity/trufflehog@v3.36.0
uses: trufflesecurity/trufflehog@v3.39.0
with:
path: ./
base: ${{ github.event.repository.default_branch }}
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ jobs:
# optional: list of build-time variables
docker-build-args: |
"any important args"
# optional: generate provenance attestation for the build, default: false
docker-build-provenance: "mode=min,inline-only=true"
# optional: set the target stage to build
docker-build-target: "any target"
# optional: path to the Dockerfile, default: ./Dockerfile
Expand Down

0 comments on commit a453a79

Please sign in to comment.