From bd4c53d13e2fc760b38f7387664424eba74f3b9c Mon Sep 17 00:00:00 2001 From: Xun Jiang Date: Tue, 28 Oct 2025 15:36:01 +0800 Subject: [PATCH] Bump base image and Golang version for v1.17.1 Signed-off-by: Xun Jiang --- Dockerfile | 6 +++--- Dockerfile-Windows | 2 +- Tiltfile | 2 +- go.mod | 2 +- hack/build-image/Dockerfile | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index a357c6749..cf0dcd5e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Velero binary build section -FROM --platform=$BUILDPLATFORM golang:1.24.6-bookworm AS velero-builder +FROM --platform=$BUILDPLATFORM golang:1.24.9-bookworm 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.24.6-bookworm AS restic-builder +FROM --platform=$BUILDPLATFORM golang:1.24.9-bookworm 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.73 +FROM paketobuildpacks/run-jammy-tiny:0.2.78 LABEL maintainer="Xun Jiang " diff --git a/Dockerfile-Windows b/Dockerfile-Windows index c89f44525..9556ba580 100644 --- a/Dockerfile-Windows +++ b/Dockerfile-Windows @@ -15,7 +15,7 @@ ARG OS_VERSION=1809 # Velero binary build section -FROM --platform=$BUILDPLATFORM golang:1.24.6-bookworm AS velero-builder +FROM --platform=$BUILDPLATFORM golang:1.24.9-bookworm AS velero-builder ARG GOPROXY ARG BIN diff --git a/Tiltfile b/Tiltfile index 89dc4b72c..03eb26a7e 100644 --- a/Tiltfile +++ b/Tiltfile @@ -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.24.6 as tilt-helper +FROM golang:1.24.9 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 && \ diff --git a/go.mod b/go.mod index d9a64b18a..54c883d69 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/vmware-tanzu/velero go 1.24.0 -toolchain go1.24.6 +toolchain go1.24.9 require ( cloud.google.com/go/storage v1.55.0 diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile index c10038295..bbb21b2c0 100644 --- a/hack/build-image/Dockerfile +++ b/hack/build-image/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM --platform=$TARGETPLATFORM golang:1.24.6-bookworm +FROM --platform=$TARGETPLATFORM golang:1.24.9-bookworm ARG GOPROXY