Skip to content

Commit ff7ea2e

Browse files
authored
Merge pull request #1708 from zhanggbj/master
Bump trivy and go version for security scan and fix
2 parents fb0d5c8 + d26f3fb commit ff7ea2e

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ GO_VERSION ?= 1.25.8
3636

3737
# Binaries
3838
GO_INSTALL := ./hack/go-install.sh
39-
TRIVY_VER := 0.49.1
39+
TRIVY_VER := 0.69.2
4040
GOVULNCHECK_BIN := govulncheck
4141
GOVULNCHECK_VER := v1.1.4
4242
GOVULNCHECK := $(abspath $(TOOLS_BIN_DIR)/$(GOVULNCHECK_BIN)-$(GOVULNCHECK_VER))

cluster/images/controller-manager/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
## BUILD ARGS ##
1515
################################################################################
1616
# This build arg allows the specification of a custom Golang image.
17-
ARG GOLANG_IMAGE=golang:1.25.0
17+
ARG GOLANG_IMAGE=golang:1.25.8
1818

1919
# The distroless image on which the CPI manager image is built.
2020
ARG DISTROLESS_IMAGE=gcr.io/distroless/static-debian11:latest

0 commit comments

Comments
 (0)