Skip to content

Commit 0b3f013

Browse files
kaovilaikaovilai
committed
Add restic caching
if fix_restic_cve.txt changes, only the dep added during patch will require redownload. ``` ❯ make container [+] Building 64.5s (20/20) FINISHED docker-container:colima-multiplat => [internal] load build definition from Dockerfile 0.0s => => transferring dockerfile: 3.24kB 0.0s => [internal] load metadata for docker.io/paketobuildpacks/run-jammy-tiny:latest 0.1s => [internal] load metadata for docker.io/library/golang:1.22-bookworm 0.1s => [internal] load .dockerignore 0.0s => => transferring context: 60B 0.0s => [stage-2 1/3] FROM docker.io/paketobuildpacks/run-jammy-tiny:latest@sha256:6a3b9424b0616c4c37309b3f3e410f305ad75c484ab74b0a624d22c8a33ae5ae 0.0s => => resolve docker.io/paketobuildpacks/run-jammy-tiny:latest@sha256:6a3b9424b0616c4c37309b3f3e410f305ad75c484ab74b0a624d22c8a33ae5ae 0.0s => [restic-builder 1/5] FROM docker.io/library/golang:1.22-bookworm@sha256:475ff60e52faaf037be2e7a1bc2ea5ea4aaa3396274af3def6545124a18b99b4 0.0s => => resolve docker.io/library/golang:1.22-bookworm@sha256:475ff60e52faaf037be2e7a1bc2ea5ea4aaa3396274af3def6545124a18b99b4 0.0s => [internal] load build context 0.3s => => transferring context: 546.21kB 0.3s => CACHED [restic-builder 2/5] RUN if [ "velero" = "velero" ]; then mkdir -p /build/restic && cd /build/restic && git clone --single-branch -b v0.15.0 https://github.com/restic/restic.git . && go mod download; fi 0.0s => [restic-builder 3/5] COPY hack/fix_restic_cve.txt /go/src/github.com/vmware-tanzu/velero/hack/ 0.0s => CACHED [velero-builder 2/6] WORKDIR /go/src/github.com/vmware-tanzu/velero 0.0s => CACHED [velero-builder 3/6] COPY go.mod go.sum /go/src/github.com/vmware-tanzu/velero/ 0.0s => CACHED [velero-builder 4/6] RUN go mod download 0.0s => [velero-builder 5/6] COPY . /go/src/github.com/vmware-tanzu/velero 6.5s => [restic-builder 4/5] RUN if [ "velero" = "velero" ]; then mkdir -p /output/usr/bin && cd /build/restic && git apply /go/src/github.com/vmware-tanzu/velero/hack/fix_restic_cve.txt && go mod download; fi 7.2s => [velero-builder 6/6] RUN mkdir -p /output/usr/bin && export GOARM=$( echo "" | cut -c2-) && go build -o /output/velero -ldflags "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=main -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=590f6df48d3fdc 55.5s => [restic-builder 5/5] RUN if [ "velero" = "velero" ]; then cd /build/restic && GOARM=$(echo "" | cut -c2-) go run build.go --goos "linux" --goarch "amd64" --goarm "" -o /output/usr/bin/restic && chmod +x /output/usr/bin/restic; fi && go cle 30.0s => CACHED [stage-2 2/3] COPY --from=velero-builder /output / 0.0s => CACHED [stage-2 3/3] COPY --from=restic-builder /output / 0.0s => exporting to docker image format 0.7s => => exporting layers 0.0s => => exporting manifest sha256:d275186bbf7b7fb08da8fe957037d8600c7b96693fe59bdfb119d977058daaa0 0.0s => => exporting config sha256:5cb88b0eac0b14df3efd549e0ca4df1980501a5f5cea677f0de1f5dd97050141 0.0s => => sending tarball 0.7s => importing to docker 0.0s container: velero/velero:main ``` Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
1 parent 590f6df commit 0b3f013

File tree

2 files changed

+25
-62
lines changed

2 files changed

+25
-62
lines changed

‎Dockerfile‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,31 @@ ENV CGO_ENABLED=0 \
6666
GOARCH=${TARGETARCH} \
6767
GOARM=${TARGETVARIANT}
6868

69-
COPY . /go/src/github.com/vmware-tanzu/velero
70-
71-
RUN mkdir -p /output/usr/bin && \
72-
export GOARM=$(echo "${GOARM}" | cut -c2-) && \
73-
/go/src/github.com/vmware-tanzu/velero/hack/build-restic.sh && \
74-
go clean -modcache -cache
69+
# cache go mod download before applying patches
70+
RUN --mount=type=cache,target=/go/pkg/mod if [ "${BIN}" = "velero" ]; then \
71+
mkdir -p /build/restic && \
72+
cd /build/restic && \
73+
git clone --single-branch -b v${RESTIC_VERSION} https://github.com/restic/restic.git . && \
74+
go mod download; \
75+
fi
76+
77+
# invalidate cache if patch changes
78+
COPY hack/fix_restic_cve.txt /go/src/github.com/vmware-tanzu/velero/hack/
79+
80+
# cache go mod download after applying patches
81+
RUN --mount=type=cache,target=/go/pkg/mod if [ "${BIN}" = "velero" ]; then \
82+
mkdir -p /output/usr/bin && \
83+
cd /build/restic && \
84+
git apply /go/src/github.com/vmware-tanzu/velero/hack/fix_restic_cve.txt && \
85+
go mod download; \
86+
fi
87+
88+
# arch specific build layer
89+
RUN --mount=type=cache,target=/go/pkg/mod if [ "${BIN}" = "velero" ]; then \
90+
cd /build/restic && \
91+
GOARM=$(echo "${GOARM}" | cut -c2-) go run build.go --goos "${GOOS}" --goarch "${GOARCH}" --goarm "${GOARM}" -o /output/usr/bin/restic && \
92+
chmod +x /output/usr/bin/restic; \
93+
fi
7594

7695
# Velero image packing section
7796
FROM paketobuildpacks/run-jammy-tiny:latest

‎hack/build-restic.sh‎

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

0 commit comments

Comments
 (0)