Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile-velero-restore-helper.ubi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/konveyor/builder:latest AS builder
FROM quay.io/konveyor/builder:ubi9-v1.25.3 AS builder
ENV GOPATH=$APP_ROOT
COPY . $APP_ROOT/src/github.com/vmware-tanzu/velero
WORKDIR $APP_ROOT/src/github.com/vmware-tanzu/velero
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.ubi
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM quay.io/konveyor/builder:ubi9-v1.23 AS builder
FROM quay.io/konveyor/builder:ubi9-v1.25.3 AS builder
ENV GOPATH=$APP_ROOT
COPY . /go/src/github.com/vmware-tanzu/velero
WORKDIR /go/src/github.com/vmware-tanzu/velero
RUN CGO_ENABLED=0 GOOS=linux go build -a -mod=mod -ldflags '-extldflags "-static" -X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=1.12.4' -o /go/src/velero github.com/vmware-tanzu/velero/cmd/velero
RUN CGO_ENABLED=0 GOOS=linux go build -a -mod=mod -ldflags '-extldflags "-static"' -o /go/src/velero-helper github.com/vmware-tanzu/velero/cmd/velero-helper

FROM quay.io/konveyor/builder:ubi9-v1.23 AS restic-builder
FROM quay.io/konveyor/builder:ubi9-v1.25.3 AS restic-builder
ENV GOPATH=$APP_ROOT
RUN mkdir -p $APP_ROOT/src/github.com/restic \
&& cd $APP_ROOT/src/github.com/restic \
Expand Down
2 changes: 1 addition & 1 deletion Makefile.prow
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ $(GOBIN)/golangci-lint:

$(GOBIN)/setup-envtest:
@echo "Installing envtest tools"
go install sigs.k8s.io/controller-runtime/tools/setup-envtest@v0.0.0-20230216140739-c98506dc3b8e
go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest

$(GOBIN)/protoc:
@echo "Installing protoc and plugins"
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/vmware-tanzu/velero

go 1.23.0

toolchain go1.23.6
go 1.25.3

require (
cloud.google.com/go/storage v1.30.1
Expand Down