diff --git a/go.work.sum b/go.work.sum index 758a45bdc..1a80d8d3a 100644 --- a/go.work.sum +++ b/go.work.sum @@ -258,6 +258,8 @@ github.com/danieljoos/wincred v1.2.1/go.mod h1:uGaFL9fDn3OLTvzCGulzE+SzjEe5NGlh5 github.com/devigned/tab v0.1.1/go.mod h1:XG9mPq0dFghrYvoBF3xdRrJzSTX1b7IQrvaL9mzjeJY= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= +github.com/docker/docker v26.1.5+incompatible h1:NEAxTwEjxV6VbBMBoGG3zPqbiJosIApZjxlbrG9q3/g= +github.com/docker/docker v26.1.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= diff --git a/plugins/ci/CHANGELOG.md b/plugins/ci/CHANGELOG.md index a48a4c4f3..4b1d3cfb8 100644 --- a/plugins/ci/CHANGELOG.md +++ b/plugins/ci/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 5.7.1 +- fixed docker vulnerability + ## 5.7.0 - Add support for OPA custom libs diff --git a/plugins/ci/Dockerfile b/plugins/ci/Dockerfile index 330b4a7eb..d54d1d6f5 100644 --- a/plugins/ci/Dockerfile +++ b/plugins/ci/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.20 AS downloader ARG TARGETARCH ARG TARGETOS ENV tfsecVersion=1.28.9 -ENV trivyVersion=0.54.0 +ENV trivyVersion=0.54.1 ENV polarisVersion=9.0.0 ENV plutoVersion=5.20.0 ENV helmVersion=3.15.3 diff --git a/plugins/ci/go.mod b/plugins/ci/go.mod index 6707c6ca6..9774f1efe 100644 --- a/plugins/ci/go.mod +++ b/plugins/ci/go.mod @@ -24,7 +24,7 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/docker/cli v25.0.3+incompatible // indirect github.com/docker/distribution v2.8.3+incompatible // indirect - github.com/docker/docker v26.1.4+incompatible // indirect + github.com/docker/docker v26.1.5+incompatible // indirect github.com/docker/docker-credential-helpers v0.8.1 // indirect github.com/emicklei/go-restful/v3 v3.11.3 // indirect github.com/evanphx/json-patch v5.9.0+incompatible // indirect diff --git a/plugins/ci/go.sum b/plugins/ci/go.sum index 1cbf2d478..240652c90 100644 --- a/plugins/ci/go.sum +++ b/plugins/ci/go.sum @@ -32,8 +32,8 @@ github.com/docker/cli v25.0.3+incompatible h1:KLeNs7zws74oFuVhgZQ5ONGZiXUUdgsdy6 github.com/docker/cli v25.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v26.1.4+incompatible h1:vuTpXDuoga+Z38m1OZHzl7NKisKWaWlhjQk7IDPSLsU= -github.com/docker/docker v26.1.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v26.1.5+incompatible h1:NEAxTwEjxV6VbBMBoGG3zPqbiJosIApZjxlbrG9q3/g= +github.com/docker/docker v26.1.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.1 h1:j/eKUktUltBtMzKqmfLB0PAgqYyMHOp5vfsD1807oKo= github.com/docker/docker-credential-helpers v0.8.1/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= diff --git a/plugins/ci/version.txt b/plugins/ci/version.txt index 42cdd0b54..64ff7ded7 100644 --- a/plugins/ci/version.txt +++ b/plugins/ci/version.txt @@ -1 +1 @@ -5.7.0 +5.7.1 diff --git a/plugins/trivy/CHANGELOG.md b/plugins/trivy/CHANGELOG.md index 994a0ebc8..854a6bab0 100644 --- a/plugins/trivy/CHANGELOG.md +++ b/plugins/trivy/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 0.29.5 +* fixed docker vulnerability + ## 0.29.4 * fixed docker vulnerability diff --git a/plugins/trivy/Dockerfile b/plugins/trivy/Dockerfile index 2aaf6d22e..32e74ae6e 100644 --- a/plugins/trivy/Dockerfile +++ b/plugins/trivy/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.20 AS downloader ARG TARGETARCH ARG TARGETOS -ENV trivyVersion=0.54.0 +ENV trivyVersion=0.54.1 RUN apk update && apk add curl ENV kubectlVersion=1.29.0 diff --git a/plugins/trivy/go.mod b/plugins/trivy/go.mod index db852b196..457e56ab2 100644 --- a/plugins/trivy/go.mod +++ b/plugins/trivy/go.mod @@ -19,7 +19,7 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/docker/cli v25.0.3+incompatible // indirect github.com/docker/distribution v2.8.3+incompatible // indirect - github.com/docker/docker v26.1.4+incompatible // indirect + github.com/docker/docker v26.1.5+incompatible // indirect github.com/docker/docker-credential-helpers v0.8.1 // indirect github.com/emicklei/go-restful/v3 v3.11.3 // indirect github.com/evanphx/json-patch v5.9.0+incompatible // indirect diff --git a/plugins/trivy/go.sum b/plugins/trivy/go.sum index b65f86d47..3fe9c4681 100644 --- a/plugins/trivy/go.sum +++ b/plugins/trivy/go.sum @@ -10,8 +10,8 @@ github.com/docker/cli v25.0.3+incompatible h1:KLeNs7zws74oFuVhgZQ5ONGZiXUUdgsdy6 github.com/docker/cli v25.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v26.1.4+incompatible h1:vuTpXDuoga+Z38m1OZHzl7NKisKWaWlhjQk7IDPSLsU= -github.com/docker/docker v26.1.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v26.1.5+incompatible h1:NEAxTwEjxV6VbBMBoGG3zPqbiJosIApZjxlbrG9q3/g= +github.com/docker/docker v26.1.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.1 h1:j/eKUktUltBtMzKqmfLB0PAgqYyMHOp5vfsD1807oKo= github.com/docker/docker-credential-helpers v0.8.1/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/emicklei/go-restful/v3 v3.11.3 h1:yagOQz/38xJmcNeZJtrUcKjkHRltIaIFXKWeG1SkWGE= diff --git a/plugins/trivy/version.txt b/plugins/trivy/version.txt index 35b1b3d1d..88f8ee85d 100644 --- a/plugins/trivy/version.txt +++ b/plugins/trivy/version.txt @@ -1 +1 @@ -0.29.4 +0.29.5