diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index b3456ab8..33776a9b 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -53,11 +53,12 @@ jobs: - name: Set up Trivy env: - TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db + 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: | docker run --rm aquasec/trivy --version docker volume create trivy-db - docker run --rm -v trivy-db:/root/.cache/ aquasec/trivy image --download-db-only + docker run --rm -e TRIVY_DB_REPOSITORY -e TRIVY_JAVA_DB_REPOSITORY -v trivy-db:/root/.cache/ aquasec/trivy image --download-db-only - name: Run Trivy vulnerability scanner for low severity cases run: | diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 02d3d42e..3a40436b 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -41,11 +41,12 @@ jobs: - name: Set up Trivy env: - TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db + 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: | docker run --rm aquasec/trivy --version docker volume create trivy-db - docker run --rm -v trivy-db:/root/.cache/ aquasec/trivy image --download-db-only + docker run --rm -e TRIVY_DB_REPOSITORY -e TRIVY_JAVA_DB_REPOSITORY -v trivy-db:/root/.cache/ aquasec/trivy image --download-db-only - name: Run Trivy vulnerability scanner for low severity cases run: | diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index fb2083c2..be38a561 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -31,7 +31,7 @@ jobs: format: "sarif" output: "trivy-repository-scan.sarif" env: - TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db + TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db,aquasec/trivy-db,ghcr.io/aquasecurity/trivy-db - name: Upload Trivy scan results to GitHub Security uses: github/codeql-action/upload-sarif@v3.27.0 diff --git a/Dockerfile b/Dockerfile index 1d6f95a1..31ebbbe7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,7 +44,7 @@ ARG GECKODRIVER_VERSION="0.35.0-r0" ARG OPENSSL_VERSION="3.3.2-r1" # renovate: datasource=repology depName=alpine_3_20/expat versioning=loose -ARG EXPAT_VERSION="2.6.3-r0" +ARG EXPAT_VERSION="2.6.4-r0" RUN apk add --no-cache firefox="${FIREFOX_VERSION}" font-noto=="${FONT_MOTO_VERSION}" && \ apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community geckodriver="${GECKODRIVER_VERSION}" && \