Skip to content

Commit 5bcfece

Browse files
authored
fix(deps): Bump vendored builds: trivy 0.74.0, adapter v0.41.0, pin cleanup (backport #893) (#898)
Signed-off-by: Prasanth Baskar <prasanth@8gears.com>
1 parent a4b7e1c commit 5bcfece

2 files changed

Lines changed: 12 additions & 11 deletions

File tree

taskfile/build.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,10 @@ tasks:
165165
trap "rm -rf $DIST_DIR" EXIT
166166
git clone --branch {{.DISTRIBUTION_VERSION}} --depth 1 {{.DISTRIBUTION_SRC}} "$DIST_DIR"
167167
cd "$DIST_DIR"
168-
go mod edit -require golang.org/x/crypto@v0.52.0
169-
go mod edit -require golang.org/x/net@v0.55.0
168+
go mod edit -require golang.org/x/crypto@v0.57.0
169+
go mod edit -require golang.org/x/net@v0.59.0
170+
go mod edit -require golang.org/x/text@v0.42.0
171+
go mod edit -require google.golang.org/grpc@v1.83.2
170172
go mod tidy -e
171173
go mod vendor
172174
REVISION=$(git rev-parse HEAD)
@@ -192,8 +194,6 @@ tasks:
192194
trap "rm -rf $LPROBE_DIR" EXIT
193195
git clone --branch v{{.LPROBE_VERSION}} --depth 1 https://github.com/fivexl/lprobe.git "$LPROBE_DIR"
194196
cd "$LPROBE_DIR"
195-
go mod edit -require github.com/go-jose/go-jose/v4@v4.1.4
196-
go mod edit -require golang.org/x/net@v0.55.0
197197
go mod tidy -e
198198
CGO_ENABLED=0 GOOS={{.GOOS}} GOARCH={{.GOARCH}} go build -trimpath -o "{{.ROOT_DIR}}/bin/{{.PLATFORM}}/lprobe" .
199199
@@ -214,7 +214,10 @@ tasks:
214214
trap "rm -rf $TRIVY_DIR" EXIT
215215
git clone --branch v{{.TRIVY_VERSION}} --depth 1 https://github.com/aquasecurity/trivy.git "$TRIVY_DIR"
216216
cd "$TRIVY_DIR"
217-
go mod edit -require github.com/containerd/containerd/v2@v2.3.2
217+
go mod edit -require github.com/containerd/containerd/v2@v2.3.5
218+
go mod edit -require golang.org/x/crypto@v0.56.0
219+
go mod edit -require google.golang.org/grpc@v1.83.2
220+
go mod edit -require github.com/moby/go-archive@v0.3.0
218221
go mod tidy -e
219222
GOTOOLCHAIN=go{{.GO_VERSION_PIN}} GOEXPERIMENT=jsonv2 CGO_ENABLED=0 GOOS={{.GOOS}} GOARCH={{.GOARCH}} go build -trimpath -o "{{.ROOT_DIR}}/bin/{{.PLATFORM}}/trivy" ./cmd/trivy
220223
@@ -234,8 +237,6 @@ tasks:
234237
trap "rm -rf $TRIVY_DIR" EXIT
235238
git clone --branch {{.HARBOR_SCANNER_TRIVY_VERSION}} --depth 1 https://github.com/container-registry/harbor-scanner-trivy.git "$TRIVY_DIR"
236239
cd "$TRIVY_DIR"
237-
go mod edit -require golang.org/x/net@v0.55.0
238-
go mod tidy -e
239240
CGO_ENABLED=0 GOOS={{.GOOS}} GOARCH={{.GOARCH}} go build -o "{{.ROOT_DIR}}/bin/{{.PLATFORM}}/scanner-trivy" cmd/scanner-trivy/main.go
240241
241242
# --- API Generation ---

versions.env

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ POSTGRES_VERSION=16
2727

2828
# External dependencies
2929
DISTRIBUTION_VERSION=v3.1.1
30-
TRIVY_VERSION=0.71.2
31-
TRIVY_BASE_IMAGE_VERSION=0.71.2
32-
HARBOR_SCANNER_TRIVY_VERSION=v0.38.1
33-
LPROBE_VERSION=0.1.9
30+
TRIVY_VERSION=0.74.0
31+
TRIVY_BASE_IMAGE_VERSION=0.74.0
32+
HARBOR_SCANNER_TRIVY_VERSION=v0.41.0
33+
LPROBE_VERSION=0.2.1

0 commit comments

Comments
 (0)