diff --git a/Dockerfile b/Dockerfile index 4f981627fc..af9636abec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Velero binary build section -FROM --platform=$BUILDPLATFORM golang:1.23.8-bookworm AS velero-builder +FROM --platform=$BUILDPLATFORM golang:1.23.10-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.23.8-bookworm AS restic-builder +FROM --platform=$BUILDPLATFORM golang:1.23.10-bookworm AS restic-builder ARG GOPROXY ARG BIN @@ -82,4 +82,3 @@ COPY --from=velero-builder /output / COPY --from=restic-builder /output / USER cnb:cnb - diff --git a/Dockerfile-Windows b/Dockerfile-Windows index d18999320d..730bcd3984 100644 --- a/Dockerfile-Windows +++ b/Dockerfile-Windows @@ -15,7 +15,7 @@ ARG OS_VERSION=1809 # Velero binary build section -FROM --platform=$BUILDPLATFORM golang:1.23.8-bookworm AS velero-builder +FROM --platform=$BUILDPLATFORM golang:1.23.10-bookworm AS velero-builder ARG GOPROXY ARG BIN diff --git a/Tiltfile b/Tiltfile index 60573be70c..3c24a50086 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.23.8 as tilt-helper +FROM golang:1.23.10 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 050a6d8bbe..857ba86a97 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/vmware-tanzu/velero go 1.23.0 -toolchain go1.23.8 +toolchain go1.23.10 require ( cloud.google.com/go/storage v1.50.0 diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile index d4d08079f4..eb9680ee1b 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.23.8-bookworm +FROM --platform=$TARGETPLATFORM golang:1.23.10-bookworm ARG GOPROXY diff --git a/hack/fix_restic_cve.txt b/hack/fix_restic_cve.txt index b4e42bee2a..afeb6ee315 100644 --- a/hack/fix_restic_cve.txt +++ b/hack/fix_restic_cve.txt @@ -1,5 +1,5 @@ diff --git a/go.mod b/go.mod -index 5f939c481..5c5db077f 100644 +index 5f939c481..97ef53433 100644 --- a/go.mod +++ b/go.mod @@ -24,32 +24,32 @@ require ( @@ -66,7 +66,7 @@ index 5f939c481..5c5db077f 100644 -go 1.18 +go 1.23.0 + -+toolchain go1.23.7 ++toolchain go1.23.10 diff --git a/go.sum b/go.sum index 026e1d2fa..836a9b274 100644 --- a/go.sum