Merge pull request #854 from andyzhangx/CVE-2024-45336
test: fix trivy action failure due to CVE-2024-45336
This commit is contained in:
commit
cb2d7222d0
2
.github/workflows/trivy.yaml
vendored
2
.github/workflows/trivy.yaml
vendored
@ -15,7 +15,7 @@ jobs:
|
|||||||
- name: Install go
|
- name: Install go
|
||||||
uses: actions/setup-go@v5
|
uses: actions/setup-go@v5
|
||||||
with:
|
with:
|
||||||
go-version: 1.23.1
|
go-version: 1.23.5
|
||||||
|
|
||||||
- name: Build an image from Dockerfile
|
- name: Build an image from Dockerfile
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
2
Makefile
2
Makefile
@ -27,7 +27,7 @@ include release-tools/build.make
|
|||||||
|
|
||||||
GIT_COMMIT = $(shell git rev-parse HEAD)
|
GIT_COMMIT = $(shell git rev-parse HEAD)
|
||||||
BUILD_DATE = $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
|
BUILD_DATE = $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
|
||||||
IMAGE_VERSION ?= v4.10.0
|
IMAGE_VERSION ?= v4.11.0
|
||||||
LDFLAGS = -X ${PKG}/pkg/nfs.driverVersion=${IMAGE_VERSION} -X ${PKG}/pkg/nfs.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/nfs.buildDate=${BUILD_DATE}
|
LDFLAGS = -X ${PKG}/pkg/nfs.driverVersion=${IMAGE_VERSION} -X ${PKG}/pkg/nfs.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/nfs.buildDate=${BUILD_DATE}
|
||||||
EXT_LDFLAGS = -s -w -extldflags "-static"
|
EXT_LDFLAGS = -s -w -extldflags "-static"
|
||||||
# Use a custom version for E2E tests if we are testing in CI
|
# Use a custom version for E2E tests if we are testing in CI
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user