From e5f43133f6e8736992c9f3c1b3296e24b37e17f2 Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Wed, 19 Apr 2023 02:44:36 +0200 Subject: [PATCH] chore: Update Trivy to 0.40.0 (#223) * chore: Update trivy to 0.39.0 * chore: Update trivy to 0.40.0 --- .github/workflows/build.yaml | 2 +- Dockerfile | 2 +- test/data/config-sarif.test | 8 ++++---- test/data/config.test | 4 ++-- test/data/fs-scheck.test | 4 ++-- test/data/image-sarif.test | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 98d8466..20913a5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,7 +1,7 @@ name: "build" on: [push, pull_request] env: - TRIVY_VERSION: 0.38.1 + TRIVY_VERSION: 0.40.0 BATS_LIB_PATH: '/usr/lib/' jobs: build: diff --git a/Dockerfile b/Dockerfile index 9283039..133bce2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/aquasecurity/trivy:0.38.1 +FROM ghcr.io/aquasecurity/trivy:0.40.0 COPY entrypoint.sh / RUN apk --no-cache add bash curl npm RUN chmod +x /entrypoint.sh diff --git a/test/data/config-sarif.test b/test/data/config-sarif.test index 617eda6..1b712c0 100644 --- a/test/data/config-sarif.test +++ b/test/data/config-sarif.test @@ -43,15 +43,15 @@ "text": "No HEALTHCHECK defined" }, "fullDescription": { - "text": "You shoud add HEALTHCHECK instruction in your docker container images to perform the health check on running containers." + "text": "You should add HEALTHCHECK instruction in your docker container images to perform the health check on running containers." }, "defaultConfiguration": { "level": "note" }, "helpUri": "https://avd.aquasec.com/misconfig/ds026", "help": { - "text": "Misconfiguration DS026\nType: Dockerfile Security Check\nSeverity: LOW\nCheck: No HEALTHCHECK defined\nMessage: Add HEALTHCHECK instruction in your Dockerfile\nLink: [DS026](https://avd.aquasec.com/misconfig/ds026)\nYou shoud add HEALTHCHECK instruction in your docker container images to perform the health check on running containers.", - "markdown": "**Misconfiguration DS026**\n| Type | Severity | Check | Message | Link |\n| --- | --- | --- | --- | --- |\n|Dockerfile Security Check|LOW|No HEALTHCHECK defined|Add HEALTHCHECK instruction in your Dockerfile|[DS026](https://avd.aquasec.com/misconfig/ds026)|\n\nYou shoud add HEALTHCHECK instruction in your docker container images to perform the health check on running containers." + "text": "Misconfiguration DS026\nType: Dockerfile Security Check\nSeverity: LOW\nCheck: No HEALTHCHECK defined\nMessage: Add HEALTHCHECK instruction in your Dockerfile\nLink: [DS026](https://avd.aquasec.com/misconfig/ds026)\nYou should add HEALTHCHECK instruction in your docker container images to perform the health check on running containers.", + "markdown": "**Misconfiguration DS026**\n| Type | Severity | Check | Message | Link |\n| --- | --- | --- | --- | --- |\n|Dockerfile Security Check|LOW|No HEALTHCHECK defined|Add HEALTHCHECK instruction in your Dockerfile|[DS026](https://avd.aquasec.com/misconfig/ds026)|\n\nYou should add HEALTHCHECK instruction in your docker container images to perform the health check on running containers." }, "properties": { "precision": "very-high", @@ -64,7 +64,7 @@ } } ], - "version": "0.38.1" + "version": "0.40.0" } }, "results": [ diff --git a/test/data/config.test b/test/data/config.test index a245130..bc7c357 100644 --- a/test/data/config.test +++ b/test/data/config.test @@ -20,7 +20,7 @@ "Class": "config", "Type": "dockerfile", "MisconfSummary": { - "Successes": 22, + "Successes": 24, "Failures": 2, "Exceptions": 0 }, @@ -56,7 +56,7 @@ "ID": "DS026", "AVDID": "AVD-DS-0026", "Title": "No HEALTHCHECK defined", - "Description": "You shoud add HEALTHCHECK instruction in your docker container images to perform the health check on running containers.", + "Description": "You should add HEALTHCHECK instruction in your docker container images to perform the health check on running containers.", "Message": "Add HEALTHCHECK instruction in your Dockerfile", "Namespace": "builtin.dockerfile.DS026", "Query": "data.builtin.dockerfile.DS026.deny", diff --git a/test/data/fs-scheck.test b/test/data/fs-scheck.test index a245130..bc7c357 100644 --- a/test/data/fs-scheck.test +++ b/test/data/fs-scheck.test @@ -20,7 +20,7 @@ "Class": "config", "Type": "dockerfile", "MisconfSummary": { - "Successes": 22, + "Successes": 24, "Failures": 2, "Exceptions": 0 }, @@ -56,7 +56,7 @@ "ID": "DS026", "AVDID": "AVD-DS-0026", "Title": "No HEALTHCHECK defined", - "Description": "You shoud add HEALTHCHECK instruction in your docker container images to perform the health check on running containers.", + "Description": "You should add HEALTHCHECK instruction in your docker container images to perform the health check on running containers.", "Message": "Add HEALTHCHECK instruction in your Dockerfile", "Namespace": "builtin.dockerfile.DS026", "Query": "data.builtin.dockerfile.DS026.deny", diff --git a/test/data/image-sarif.test b/test/data/image-sarif.test index 002ae43..ce6591c 100644 --- a/test/data/image-sarif.test +++ b/test/data/image-sarif.test @@ -37,7 +37,7 @@ } } ], - "version": "0.38.1" + "version": "0.40.0" } }, "results": [