Skip to content

Commit

Permalink
Admin workflow fix (#2006)
Browse files Browse the repository at this point in the history
* Admin workflow to use the correct secret for OP

* commenting out sbom for now
  • Loading branch information
ben851 authored Dec 3, 2024
1 parent d3887e5 commit 52dc340
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
AWS_REGION: ca-central-1
DOCKER_ORG: public.ecr.aws/v6b8u5o6
DOCKER_SLUG: public.ecr.aws/v6b8u5o6/notify-admin
OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN_STAGING }}

permissions:
id-token: write # This is required for requesting the OIDC JWT
Expand Down Expand Up @@ -108,15 +108,15 @@ jobs:
env:
TOKEN: ${{ steps.notify-pr-bot.outputs.token }}

- name: Docker generate SBOM
uses: cds-snc/security-tools/.github/actions/generate-sbom@34794baf2af592913bb5b51d8df4f8d0acc49b6f # v3.2.0
env:
TRIVY_DB_REPOSITORY: ${{ vars.TRIVY_DB_REPOSITORY }}
with:
docker_image: "${{ env.DOCKER_SLUG }}:latest"
dockerfile_path: "ci/Dockerfile"
sbom_name: "notification-admin"
token: "${{ secrets.GITHUB_TOKEN }}"
#- name: Docker generate SBOM
# uses: cds-snc/security-tools/.github/actions/generate-sbom@34794baf2af592913bb5b51d8df4f8d0acc49b6f # v3.2.0
# env:
# TRIVY_DB_REPOSITORY: ${{ vars.TRIVY_DB_REPOSITORY }}
# with:
# docker_image: "${{ env.DOCKER_SLUG }}:latest"
# dockerfile_path: "ci/Dockerfile"
# sbom_name: "notification-admin"
# token: "${{ secrets.GITHUB_TOKEN }}"

- name: Notify Slack channel if this job failed
if: ${{ failure() }}
Expand Down

0 comments on commit 52dc340

Please sign in to comment.