Skip to content

Commit 39db9f9

Browse files
committed
Remove Restic build from Dockerfile, Makefile and Tiltfile.
Delete Restic-build-related scripts. Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>
1 parent 4d9bd91 commit 39db9f9

6 files changed

Lines changed: 1 addition & 366 deletions

File tree

Dockerfile

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -48,38 +48,11 @@ RUN mkdir -p /output/usr/bin && \
4848
-ldflags "${LDFLAGS}" ${PKG}/cmd/velero-helper && \
4949
go clean -modcache -cache
5050

51-
# Restic binary build section
52-
FROM --platform=$BUILDPLATFORM golang:1.25-trixie AS restic-builder
53-
54-
ARG GOPROXY
55-
ARG BIN
56-
ARG TARGETOS
57-
ARG TARGETARCH
58-
ARG TARGETVARIANT
59-
ARG RESTIC_VERSION
60-
61-
ENV CGO_ENABLED=0 \
62-
GO111MODULE=on \
63-
GOPROXY=${GOPROXY} \
64-
GOOS=${TARGETOS} \
65-
GOARCH=${TARGETARCH} \
66-
GOARM=${TARGETVARIANT}
67-
68-
COPY . /go/src/github.com/vmware-tanzu/velero
69-
70-
RUN mkdir -p /output/usr/bin && \
71-
export GOARM=$(echo "${GOARM}" | cut -c2-) && \
72-
/go/src/github.com/vmware-tanzu/velero/hack/build-restic.sh && \
73-
go clean -modcache -cache
74-
7551
# Velero image packing section
7652
FROM paketobuildpacks/run-jammy-tiny:latest
7753

7854
LABEL maintainer="Xun Jiang <jxun@vmware.com>"
7955

8056
COPY --from=velero-builder /output /
8157

82-
COPY --from=restic-builder /output /
83-
8458
USER cnb:cnb
85-

Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@ see: https://velero.io/docs/main/build-from-source/#making-images-and-updating-v
105105
endef
106106
# comma cannot be escaped and can only be used in Make function arguments by putting into variable
107107
comma=,
108-
# The version of restic binary to be downloaded
109-
RESTIC_VERSION ?= 0.15.0
110108

111109
CLI_PLATFORMS ?= linux-amd64 linux-arm linux-arm64 darwin-amd64 darwin-arm64 windows-amd64 linux-ppc64le linux-s390x
112110
BUILD_OUTPUT_TYPE ?= docker
@@ -260,7 +258,6 @@ container-linux:
260258
--build-arg=GIT_SHA=$(GIT_SHA) \
261259
--build-arg=GIT_TREE_STATE=$(GIT_TREE_STATE) \
262260
--build-arg=REGISTRY=$(REGISTRY) \
263-
--build-arg=RESTIC_VERSION=$(RESTIC_VERSION) \
264261
--provenance=false \
265262
--sbom=false \
266263
-f $(VELERO_DOCKERFILE) .

Tiltfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,6 @@ local_resource(
103103
deps = ["internal", "pkg/cmd"],
104104
)
105105

106-
local_resource(
107-
"restic_binary",
108-
cmd = 'cd ' + '.' + ';mkdir -p _tiltbuild/restic; BIN=velero GOOS=linux GOARCH=amd64 GOARM="" RESTIC_VERSION=0.13.1 OUTPUT_DIR=_tiltbuild/restic ./hack/build-restic.sh',
109-
)
110-
111106
# Note: we need a distro with a bash shell to exec into the Velero container
112107
tilt_dockerfile_header = """
113108
FROM ubuntu:22.04 as tilt
@@ -118,7 +113,6 @@ WORKDIR /
118113
COPY --from=tilt-helper /start.sh .
119114
COPY --from=tilt-helper /restart.sh .
120115
COPY velero .
121-
COPY restic/restic /usr/bin/restic
122116
"""
123117

124118
dockerfile_contents = "\n".join([
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove Restic build from Dockerfile, Makefile and Tiltfile.

hack/build-restic.sh

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)