From 7cd92a5aac33c54b3e979775bd45e142615f8320 Mon Sep 17 00:00:00 2001 From: Lyndon-Li Date: Wed, 23 Oct 2024 11:35:48 +0800 Subject: [PATCH] Pin the version of Golang and base image for v1.15.0 Signed-off-by: Lyndon-Li --- Dockerfile | 6 +++--- Tiltfile | 2 +- go.mod | 2 +- hack/build-image/Dockerfile | 2 +- pkg/uploader/kopia/block_restore_windows.go | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2c70dd4562..a9a008bc21 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Velero binary build section -FROM --platform=$BUILDPLATFORM golang:1.22-bookworm AS velero-builder +FROM --platform=$BUILDPLATFORM golang:1.22.8-bookworm AS velero-builder ARG GOPROXY ARG BIN @@ -47,7 +47,7 @@ RUN mkdir -p /output/usr/bin && \ go clean -modcache -cache # Restic binary build section -FROM --platform=$BUILDPLATFORM golang:1.22-bookworm AS restic-builder +FROM --platform=$BUILDPLATFORM golang:1.22.8-bookworm AS restic-builder ARG BIN ARG TARGETOS @@ -70,7 +70,7 @@ RUN mkdir -p /output/usr/bin && \ go clean -modcache -cache # Velero image packing section -FROM paketobuildpacks/run-jammy-tiny:latest +FROM paketobuildpacks/run-jammy-tiny:0.2.52 LABEL maintainer="Xun Jiang " diff --git a/Tiltfile b/Tiltfile index 994f27717a..14f3aa18b8 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.22 as tilt-helper +FROM golang:1.22.8 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 337e0100df..330ece7e5c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/vmware-tanzu/velero -go 1.22.0 +go 1.22.8 require ( cloud.google.com/go/storage v1.40.0 diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile index fb72a5290c..1e51688dc9 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.22-bookworm +FROM --platform=$TARGETPLATFORM golang:1.22.8-bookworm ARG GOPROXY diff --git a/pkg/uploader/kopia/block_restore_windows.go b/pkg/uploader/kopia/block_restore_windows.go index ff6e726c87..702e0a5e26 100644 --- a/pkg/uploader/kopia/block_restore_windows.go +++ b/pkg/uploader/kopia/block_restore_windows.go @@ -33,7 +33,7 @@ type BlockOutput struct { targetFileName string } -func (o *BlockOutput) WriteFile(ctx context.Context, relativePath string, remoteFile fs.File) error { +func (o *BlockOutput) WriteFile(ctx context.Context, relativePath string, remoteFile fs.File, progressCb restore.FileWriteProgress) error { return fmt.Errorf("block mode is not supported for Windows") }