From 2b1de9324919e5edbbf01f9c8fc89d6f7f212259 Mon Sep 17 00:00:00 2001 From: DmitriyLewen <91113035+DmitriyLewen@users.noreply.github.com> Date: Thu, 9 Jun 2022 16:45:01 +0600 Subject: [PATCH] feat(mariner): added support for CBL-Mariner Distroless v2.0 (#2293) --- docs/docs/vulnerability/distributions.md | 2 +- go.mod | 6 +++--- go.sum | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/docs/vulnerability/distributions.md b/docs/docs/vulnerability/distributions.md index 4fc4d874a3f9..8d2faea7abcc 100644 --- a/docs/docs/vulnerability/distributions.md +++ b/docs/docs/vulnerability/distributions.md @@ -7,7 +7,7 @@ The following table provides an outline of the features Trivy offers. | Version | Container image | Virtual machine | Distroless | Multi-arch | Unfixed support | |---------|:---------------:|:---------------:|:----------:|:------------:|:---------------:| | 1.0 | ✔ | ✔ | | amd64, arm64 | ✔ | -| 2.0 | ✔ | ✔ | | amd64, arm64 | ✔ | +| 2.0 | ✔ | ✔ | ✔ | amd64, arm64 | ✔ | ### Examples diff --git a/go.mod b/go.mod index 69b348703c67..3b800ef4f830 100644 --- a/go.mod +++ b/go.mod @@ -7,8 +7,8 @@ require ( github.com/Masterminds/sprig/v3 v3.2.2 github.com/NYTimes/gziphandler v1.1.1 github.com/aquasecurity/bolt-fixtures v0.0.0-20200903104109-d34e7f983986 - github.com/aquasecurity/fanal v0.0.0-20220607082632-cee9188f43ac - github.com/aquasecurity/go-dep-parser v0.0.0-20220503151658-d316f5cc2cff + github.com/aquasecurity/fanal v0.0.0-20220609071827-a54e3bfc23f2 + github.com/aquasecurity/go-dep-parser v0.0.0-20220531123411-1dabb532605f github.com/aquasecurity/go-gem-version v0.0.0-20201115065557-8eed6fe000ce github.com/aquasecurity/go-npm-version v0.0.0-20201110091526-0b796d180798 github.com/aquasecurity/go-pep440-version v0.0.0-20210121094942-22b2f8951d46 @@ -53,7 +53,7 @@ require ( require ( cloud.google.com/go v0.99.0 // indirect cloud.google.com/go/storage v1.14.0 // indirect - github.com/Azure/azure-sdk-for-go v64.0.0+incompatible // indirect + github.com/Azure/azure-sdk-for-go v65.0.0+incompatible // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Azure/go-autorest v14.2.0+incompatible // indirect github.com/Azure/go-autorest/autorest v0.11.27 // indirect diff --git a/go.sum b/go.sum index 1c15783c3683..f12cda342342 100644 --- a/go.sum +++ b/go.sum @@ -55,8 +55,8 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7 github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg= github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v56.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v64.0.0+incompatible h1:WAA77WBDWYtNfCC95V70VvkdzHe+wM/r2MQ9mG7fnQs= -github.com/Azure/azure-sdk-for-go v64.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v65.0.0+incompatible h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw= +github.com/Azure/azure-sdk-for-go v65.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= @@ -188,10 +188,10 @@ github.com/aquasecurity/bolt-fixtures v0.0.0-20200903104109-d34e7f983986 h1:2a30 github.com/aquasecurity/bolt-fixtures v0.0.0-20200903104109-d34e7f983986/go.mod h1:NT+jyeCzXk6vXR5MTkdn4z64TgGfE5HMLC8qfj5unl8= github.com/aquasecurity/defsec v0.59.0 h1:BmX5j5Y7+IhJ4hKYGIJWMcmVUqaIiTjtEqL5doT995Q= github.com/aquasecurity/defsec v0.59.0/go.mod h1:42FxKif2itz+MHFlJ3TJjdroL9Jzj3THoexlueBTU5w= -github.com/aquasecurity/fanal v0.0.0-20220607082632-cee9188f43ac h1:OzP+N2jZH2xmwiZXXfnOEUDw+dKtGvwtmOgXkWbZjMA= -github.com/aquasecurity/fanal v0.0.0-20220607082632-cee9188f43ac/go.mod h1:c0Kqe6ffFdrugzH8NZuF5V4gllHJO6ef8u8DqXE8k9g= -github.com/aquasecurity/go-dep-parser v0.0.0-20220503151658-d316f5cc2cff h1:YNlzRYB0n4mZtfuWx6AWaGEjnLVNekchyoFDlYFZegs= -github.com/aquasecurity/go-dep-parser v0.0.0-20220503151658-d316f5cc2cff/go.mod h1:7EOQWQmyavVPY3fScbbPdd3dB/b0Q4ZbJ/NZCvNKrLs= +github.com/aquasecurity/fanal v0.0.0-20220609071827-a54e3bfc23f2 h1:DQzgFZYY/zYyfYiCCp1NN7p+eRySITxT8QT2OYFqsYo= +github.com/aquasecurity/fanal v0.0.0-20220609071827-a54e3bfc23f2/go.mod h1:od7Sx8/uDUl0UQAcclou6H/glRm5VN3Och6s/2//ym8= +github.com/aquasecurity/go-dep-parser v0.0.0-20220531123411-1dabb532605f h1:tBLOZtvvSqpe2TIcmEGpyLwVDLIORE1hRrdUiLE5bwE= +github.com/aquasecurity/go-dep-parser v0.0.0-20220531123411-1dabb532605f/go.mod h1:7EOQWQmyavVPY3fScbbPdd3dB/b0Q4ZbJ/NZCvNKrLs= github.com/aquasecurity/go-gem-version v0.0.0-20201115065557-8eed6fe000ce h1:QgBRgJvtEOBtUXilDb1MLi1p1MWoyFDXAu5DEUl5nwM= github.com/aquasecurity/go-gem-version v0.0.0-20201115065557-8eed6fe000ce/go.mod h1:HXgVzOPvXhVGLJs4ZKO817idqr/xhwsTcj17CLYY74s= github.com/aquasecurity/go-npm-version v0.0.0-20201110091526-0b796d180798 h1:eveqE9ivrt30CJ7dOajOfBavhZ4zPqHcZe/4tKp0alc=