Skip to content

Commit

Permalink
Add compile restic binary for CVE fix
Browse files Browse the repository at this point in the history
Signed-off-by: Ming <mqiu@vmware.com>
  • Loading branch information
qiuming-best committed Nov 9, 2022
1 parent cd37141 commit fc0c470
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ WORKDIR /go/src/github.com/vmware-tanzu/velero

COPY . /go/src/github.com/vmware-tanzu/velero

RUN apt-get update && apt-get install -y bzip2

FROM --platform=$BUILDPLATFORM builder-env as builder

ARG TARGETOS
Expand All @@ -45,7 +43,7 @@ ENV GOOS=${TARGETOS} \
GOARM=${TARGETVARIANT}

RUN mkdir -p /output/usr/bin && \
bash ./hack/download-restic.sh && \
bash ./hack/build-restic.sh && \
export GOARM=$( echo "${GOARM}" | cut -c2-) && \
go build -o /output/${BIN} \
-ldflags "${LDFLAGS}" ${PKG}/cmd/${BIN}
Expand Down
1 change: 1 addition & 0 deletions changelogs/unreleased/5574-qiuming-best
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add compile restic binary for CVE fix
10 changes: 6 additions & 4 deletions hack/download-restic.sh → hack/build-restic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ set -o pipefail
# is the path expected by the Velero Dockerfile.
output_dir=${OUTPUT_DIR:-/output/usr/bin}
restic_bin=${output_dir}/restic
build_path=$(dirname "$PWD")

if [[ -z "${BIN}" ]]; then
echo "BIN must be set"
Expand All @@ -46,8 +47,9 @@ if [[ -z "${RESTIC_VERSION}" ]]; then
exit 1
fi

curl -s -L https://github.com/restic/restic/releases/download/v${RESTIC_VERSION}/restic_${RESTIC_VERSION}_${GOOS}_${GOARCH}.bz2 -O
bunzip2 restic_${RESTIC_VERSION}_${GOOS}_${GOARCH}.bz2
mv restic_${RESTIC_VERSION}_${GOOS}_${GOARCH} ${restic_bin}

mkdir ${build_path}/restic
git clone -b v${RESTIC_VERSION} https://github.com/restic/restic.git ${build_path}/restic
pushd ${build_path}/restic
go run build.go -o ${restic_bin}
chmod +x ${restic_bin}
popd

0 comments on commit fc0c470

Please sign in to comment.