diff --git a/Dockerfile b/Dockerfile index ab8b811d..508ca776 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,7 +33,7 @@ RUN --mount=type=cache,target=/gomodcache --mount=type=cache,target=/gocache cd export GOFLAGS=-mod=mod && \ go-licenses save $(go list ./...) --save_path /app/licenses/ -FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base:latest-al23@sha256:c8a0394d8ad6d7d88bd9cd3e55d7c49d1a7f40758b5d088d23f24ccbf2f9cdb8 AS linux-al2023 +FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base:latest-al23@sha256:0c4c51b1ea6bd56495f46b4c7919f141b91ef3e443dab0c540921d9010817f6b AS linux-al2023 COPY --from=builder /app/bin/$ENTRYPOINT /$ENTRYPOINT COPY --from=builder /app/licenses/ /licenses/ ENV GODEBUG=fips140=off diff --git a/hack/trivy.sh b/hack/trivy.sh index f4dacb57..73b190a1 100755 --- a/hack/trivy.sh +++ b/hack/trivy.sh @@ -31,9 +31,9 @@ fi # Pulling ensures we always have the latest image (Trivy will skip pull sometimes) docker pull -q "${IMAGE_REF}" if [ -n "${OUTPUT_SARIF:+x}" ]; then - docker run --rm -v /var/run/docker.sock:/var/run/docker.sock:ro -v "${BASE_DIR}/.trivyignore:/.trivyignore:ro" public.ecr.aws/aquasecurity/trivy:0.74.0 image --ignorefile /.trivyignore -f sarif "${IMAGE_REF}" > "${BASE_DIR}/../output/${IMAGE}.sarif" + docker run --rm -v /var/run/docker.sock:/var/run/docker.sock:ro -v "${BASE_DIR}/.trivyignore:/.trivyignore:ro" public.ecr.aws/aquasecurity/trivy:0.75.0 image --ignorefile /.trivyignore -f sarif "${IMAGE_REF}" > "${BASE_DIR}/../output/${IMAGE}.sarif" # Required by GitHub to upload multiple SARIF files: https://docs.github.com/en/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning#uploading-more-than-one-sarif-file-for-a-commit yq -o json -i ".runs[].automationDetails.id = \"trivy/${IMAGE}/$(date +%s)\"" "${BASE_DIR}/../output/${IMAGE}.sarif" else - docker run --rm -v /var/run/docker.sock:/var/run/docker.sock:ro -v "${BASE_DIR}/.trivyignore:/.trivyignore:ro" public.ecr.aws/aquasecurity/trivy:0.74.0 image --ignorefile /.trivyignore -q "${IMAGE_REF}" + docker run --rm -v /var/run/docker.sock:/var/run/docker.sock:ro -v "${BASE_DIR}/.trivyignore:/.trivyignore:ro" public.ecr.aws/aquasecurity/trivy:0.75.0 image --ignorefile /.trivyignore -q "${IMAGE_REF}" fi