From eb6d364f7cbeb5fb61e43354e7a16112e90a74bf Mon Sep 17 00:00:00 2001 From: Andrew Pearce Date: Tue, 1 Oct 2024 13:55:59 +0100 Subject: [PATCH 1/4] use pull through cache for jave db --- .github/workflows/docker_job.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker_job.yml b/.github/workflows/docker_job.yml index ebca2eb742..cbfc81ee85 100644 --- a/.github/workflows/docker_job.yml +++ b/.github/workflows/docker_job.yml @@ -102,6 +102,7 @@ jobs: uses: aquasecurity/trivy-action@0.24.0 env: TRIVY_DB_REPOSITORY: ${{ steps.login_ecr.outputs.registry }}/trivy-db-public-ecr/aquasecurity/trivy-db:2 + TRIVY_JAVA_DB_EPOSITORY: ${{ steps.login_ecr.outputs.registry }}/trivy-db-public-ecr/aquasecurity/trivy-db-java:1 with: image-ref: ${{ matrix.ecr_repository }}:${{ inputs.tag }} severity: 'HIGH,CRITICAL' From 41ddf433c02d0d4ff5d83cfa4ef89edf34ec6de0 Mon Sep 17 00:00:00 2001 From: Andrew Pearce Date: Tue, 1 Oct 2024 13:57:29 +0100 Subject: [PATCH 2/4] fix --- .github/workflows/docker_job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker_job.yml b/.github/workflows/docker_job.yml index cbfc81ee85..35d16b9c3a 100644 --- a/.github/workflows/docker_job.yml +++ b/.github/workflows/docker_job.yml @@ -102,7 +102,7 @@ jobs: uses: aquasecurity/trivy-action@0.24.0 env: TRIVY_DB_REPOSITORY: ${{ steps.login_ecr.outputs.registry }}/trivy-db-public-ecr/aquasecurity/trivy-db:2 - TRIVY_JAVA_DB_EPOSITORY: ${{ steps.login_ecr.outputs.registry }}/trivy-db-public-ecr/aquasecurity/trivy-db-java:1 + TRIVY_JAVA_DB_REPOSITORY: ${{ steps.login_ecr.outputs.registry }}/trivy-db-public-ecr/aquasecurity/trivy-db-java:1 with: image-ref: ${{ matrix.ecr_repository }}:${{ inputs.tag }} severity: 'HIGH,CRITICAL' From 15df4de726c64ff01df9549df176fac05e61189f Mon Sep 17 00:00:00 2001 From: Andrew Pearce Date: Tue, 1 Oct 2024 14:01:20 +0100 Subject: [PATCH 3/4] trigger a build --- cmd/mlpa/buildtrigger | 1 + 1 file changed, 1 insertion(+) create mode 100644 cmd/mlpa/buildtrigger diff --git a/cmd/mlpa/buildtrigger b/cmd/mlpa/buildtrigger new file mode 100644 index 0000000000..be31a82dcf --- /dev/null +++ b/cmd/mlpa/buildtrigger @@ -0,0 +1 @@ +trigger a build From 8fef90499807c2cdae0c80ff30e2b25f868f10ff Mon Sep 17 00:00:00 2001 From: Andrew Pearce Date: Tue, 1 Oct 2024 14:50:07 +0100 Subject: [PATCH 4/4] fix repo ref --- .github/workflows/docker_job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker_job.yml b/.github/workflows/docker_job.yml index 35d16b9c3a..95cc10c3bf 100644 --- a/.github/workflows/docker_job.yml +++ b/.github/workflows/docker_job.yml @@ -102,7 +102,7 @@ jobs: uses: aquasecurity/trivy-action@0.24.0 env: TRIVY_DB_REPOSITORY: ${{ steps.login_ecr.outputs.registry }}/trivy-db-public-ecr/aquasecurity/trivy-db:2 - TRIVY_JAVA_DB_REPOSITORY: ${{ steps.login_ecr.outputs.registry }}/trivy-db-public-ecr/aquasecurity/trivy-db-java:1 + TRIVY_JAVA_DB_REPOSITORY: ${{ steps.login_ecr.outputs.registry }}/trivy-db-public-ecr/aquasecurity/trivy-java-db:1 with: image-ref: ${{ matrix.ecr_repository }}:${{ inputs.tag }} severity: 'HIGH,CRITICAL'