From 3f48cfd3e6d6a5bec0dfffda8ca3a146b6cefc81 Mon Sep 17 00:00:00 2001 From: Ron <45816308+rjaegers@users.noreply.github.com> Date: Wed, 15 Nov 2023 10:59:10 +0100 Subject: [PATCH 1/5] chore: move Trivy ignore rules into Dockefile --- .devcontainer/Dockerfile | 8 ++++++++ .trivyignore | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 .trivyignore diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 42cd02e4..e8599beb 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,3 +1,11 @@ +# trivy:ignore:AVD-DS-0002 +# See: https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0002/ +# We allow root access in our container that we use for development purposes + +# trivy:ignore:AVD-DS-0026 +# See: https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0026/ +# We don't require a HEALTHCHECK for our devcontainer + FROM ubuntu@sha256:2b7412e6465c3c7fc5bb21d3e6f1917c167358449fecac8176c6e496e5c1f05f ARG BATS_VERSION=1.10.0 diff --git a/.trivyignore b/.trivyignore deleted file mode 100644 index 565467de..00000000 --- a/.trivyignore +++ /dev/null @@ -1,7 +0,0 @@ -# See: https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0002/ -# We allow root access in our container that we use for development purposes -DS002 - -# See: https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0026/ -# We don't require a HEALTHCHECK for our devcontainer -DS026 From 34b2200938a84e896409b19bbba982413c5377a8 Mon Sep 17 00:00:00 2001 From: Ron <45816308+rjaegers@users.noreply.github.com> Date: Wed, 15 Nov 2023 11:13:21 +0100 Subject: [PATCH 2/5] chore: try to get inline Trivy ignore working --- .devcontainer/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index e8599beb..6d0a4040 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,8 +1,8 @@ -# trivy:ignore:AVD-DS-0002 +# trivy:ignore:DS002 # See: https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0002/ # We allow root access in our container that we use for development purposes -# trivy:ignore:AVD-DS-0026 +# trivy:ignore:DS026 # See: https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0026/ # We don't require a HEALTHCHECK for our devcontainer From 06d4343e7a4c29d5aa6bb45eb7a47ed2e5028ac6 Mon Sep 17 00:00:00 2001 From: Ron <45816308+rjaegers@users.noreply.github.com> Date: Wed, 15 Nov 2023 11:16:24 +0100 Subject: [PATCH 3/5] chore: more Trivy experimentation --- .devcontainer/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 6d0a4040..8df46e97 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,8 +1,8 @@ -# trivy:ignore:DS002 +#trivy:ignore:DS002 # See: https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0002/ # We allow root access in our container that we use for development purposes -# trivy:ignore:DS026 +#trivy:ignore:DS026 # See: https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0026/ # We don't require a HEALTHCHECK for our devcontainer From 01d78466ed5112f3bef64bd8967d14d87fce5108 Mon Sep 17 00:00:00 2001 From: Ron <45816308+rjaegers@users.noreply.github.com> Date: Wed, 15 Nov 2023 11:19:00 +0100 Subject: [PATCH 4/5] chore: trying to get Trivy syntax right --- .devcontainer/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 8df46e97..f005756d 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,8 +1,8 @@ -#trivy:ignore:DS002 +#trivy:ignore:AVD-DS-0002 # See: https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0002/ # We allow root access in our container that we use for development purposes -#trivy:ignore:DS026 +#trivy:ignore:AVD-DS-0026 # See: https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0026/ # We don't require a HEALTHCHECK for our devcontainer From 5451beabe30a3e7fb553730939bfa149bc7ae331 Mon Sep 17 00:00:00 2001 From: Ron <45816308+rjaegers@users.noreply.github.com> Date: Wed, 15 Nov 2023 11:26:11 +0100 Subject: [PATCH 5/5] chore: another try following https://github.com/aquasecurity/trivy/issues/2961#issuecomment-1765077701 --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index f005756d..7ace806c 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,3 @@ -#trivy:ignore:AVD-DS-0002 # See: https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0002/ # We allow root access in our container that we use for development purposes @@ -6,6 +5,7 @@ # See: https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0026/ # We don't require a HEALTHCHECK for our devcontainer +#trivy:ignore:AVD-DS-0002 FROM ubuntu@sha256:2b7412e6465c3c7fc5bb21d3e6f1917c167358449fecac8176c6e496e5c1f05f ARG BATS_VERSION=1.10.0