mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-09-18 14:04:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bump base images and Go version to fix CVEs

Browse Source 
Bumps golang to 1.26.7 and paketobuildpacks/run-jammy-tiny to 0.2.165
to resolve OS and Go vulnerabilities reported by trivy image scan.
Bump golangci-lint that supports Golang 1.26.

Co-authored-by: Cursor <cursoragent@cursor.com>
Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>
This commit is contained in:
Xun Jiang
2026-08-27 17:32:43 +08:00
co-authored by Cursor
parent 2b8da49df1
commit 32db614154
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/pr-linter-check.yml
+1 -1
View File
@@ -28,5 +28,5 @@ jobs:
- name: Linter check
uses: golangci/golangci-lint-action@v9
with:
version: v2.5.0
version: v2.13.1
args: --verbose
Dockerfile
+3 -3
View File
@@ -13,7 +13,7 @@
# limitations under the License.
# Velero binary build section
FROM --platform=$BUILDPLATFORM golang:1.25.11-trixie AS velero-builder
FROM --platform=$BUILDPLATFORM golang:1.26.7-trixie AS velero-builder
ARG GOPROXY
ARG BIN
@@ -49,7 +49,7 @@ RUN mkdir -p /output/usr/bin && \
go clean -modcache -cache
# Restic binary build section
FROM --platform=$BUILDPLATFORM golang:1.25.11-trixie AS restic-builder
FROM --platform=$BUILDPLATFORM golang:1.26.7-trixie AS restic-builder
ARG GOPROXY
ARG BIN
@@ -73,7 +73,7 @@ RUN mkdir -p /output/usr/bin && \
go clean -modcache -cache
# Velero image packing section
FROM paketobuildpacks/run-jammy-tiny:0.2.139
FROM paketobuildpacks/run-jammy-tiny:0.2.165
LABEL maintainer="Xun Jiang <jxun@vmware.com>"
Dockerfile-Windows
+1 -1
View File
@@ -15,7 +15,7 @@
ARG OS_VERSION=1809
# Velero binary build section
FROM --platform=$BUILDPLATFORM golang:1.25.11-trixie AS velero-builder
FROM --platform=$BUILDPLATFORM golang:1.26.7-trixie AS velero-builder
ARG GOPROXY
ARG BIN
Tiltfile
+1 -1
View File
@@ -52,7 +52,7 @@ git_sha = str(local("git rev-parse HEAD", quiet = True, echo_off = True)).strip(
tilt_helper_dockerfile_header = """
# Tilt image
FROM golang:1.25.11 as tilt-helper
FROM golang:1.26.7 as tilt-helper
# Support live reloading with Tilt
RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh && \
go.mod
+1 -1
View File
@@ -2,7 +2,7 @@ module github.com/vmware-tanzu/velero
go 1.25.8
toolchain go1.25.11
toolchain go1.26.7
require (
cloud.google.com/go/storage v1.57.2
hack/build-image/Dockerfile
+2 -2
View File
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM --platform=$TARGETPLATFORM golang:1.25.11-trixie
FROM --platform=$TARGETPLATFORM golang:1.26.7-trixie
ARG GOPROXY
@@ -98,7 +98,7 @@ RUN ARCH=$(go env GOARCH) && \
# get golangci-lint
# Use "go install" so the download goes through GOPROXY instead of the GitHub
# release API/CDN, which has been returning intermittent/persistent HTTP 504s.
RUN go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.5.0
RUN go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.13.1
# install kubectl
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/$(go env GOARCH)/kubectl