From 86ed0fa3b3eb0cb023c1bad4db72e955bc120717 Mon Sep 17 00:00:00 2001 From: Corneil du Plessis Date: Tue, 19 Nov 2024 14:20:20 +0200 Subject: [PATCH] Update Trivy env in common.yml Added trivy env to each specific Trivy job step. --- .github/workflows/common.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index a77e39be..276d49ed 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -39,9 +39,7 @@ on: env: VERBOSE: ${{ (github.debug || inputs.verbose) && 'true' || '' }} BRANCH: ${{ inputs.branch }} - MAVEN_THREADS: ${{ inputs.mavenThreads }} - TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db,aquasec/trivy-db,ghcr.io/aquasecurity/trivy-db - TRIVY_JAVA_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-java-db,aquasec/trivy-java-db,ghcr.io/aquasecurity/trivy-java-db + MAVEN_THREADS: ${{ inputs.mavenThreads }} jobs: parameters: @@ -365,6 +363,9 @@ jobs: if: ${{ inputs.enableSecurityScan }} shell: bash id: scan + env: + TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db,aquasec/trivy-db,ghcr.io/aquasecurity/trivy-db + TRIVY_JAVA_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-java-db,aquasec/trivy-java-db,ghcr.io/aquasecurity/trivy-java-db run: | ROOT_DIR=$(realpath $PWD) pushd stream-applications > /dev/null @@ -508,6 +509,9 @@ jobs: if: ${{ inputs.enableSecurityScan }} shell: bash id: scan + env: + TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db,aquasec/trivy-db,ghcr.io/aquasecurity/trivy-db + TRIVY_JAVA_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-java-db,aquasec/trivy-java-db,ghcr.io/aquasecurity/trivy-java-db run: | ROOT_DIR=$(realpath $PWD) pushd stream-applications > /dev/null @@ -660,6 +664,9 @@ jobs: if: ${{ inputs.enableSecurityScan }} shell: bash id: scan + env: + TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db,aquasec/trivy-db,ghcr.io/aquasecurity/trivy-db + TRIVY_JAVA_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-java-db,aquasec/trivy-java-db,ghcr.io/aquasecurity/trivy-java-db run: | ROOT_DIR=$(realpath $PWD) pushd stream-applications > /dev/null