Merge pull request #5577 from qiuming-best/release-1.9

Fix restic cross platform compile problem
vmware-tanzu · Nov 9, 2022 · 9a617fe · 9a617fe
2 parents 2fa4a01 + 20af506
commit 9a617fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -43,8 +43,8 @@ ENV GOOS=${TARGETOS} \
     GOARM=${TARGETVARIANT}
 
 RUN mkdir -p /output/usr/bin && \
-    bash ./hack/build-restic.sh && \
     export GOARM=$( echo "${GOARM}" | cut -c2-) && \
+    bash ./hack/build-restic.sh && \
     go build -o /output/${BIN} \
     -ldflags "${LDFLAGS}" ${PKG}/cmd/${BIN}
 

diff --git a/hack/build-restic.sh b/hack/build-restic.sh
@@ -50,6 +50,6 @@ fi
 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}
+go run build.go --goos "${GOOS}" --goarch "${GOARCH}" --goarm "${GOARM}" -o ${restic_bin}
 chmod +x ${restic_bin}
 popd