From 620ada6435a9a3f5b42b92fd0597e0aa7174fa74 Mon Sep 17 00:00:00 2001 From: Shiming Zhang Date: Tue, 18 Jan 2022 11:30:38 +0800 Subject: [PATCH] Fix build image --- hack/build.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/hack/build.sh b/hack/build.sh index 498fddc..6f514d3 100755 --- a/hack/build.sh +++ b/hack/build.sh @@ -19,6 +19,13 @@ BUILD_PLATFORMS=( # linux/ppc64le ) +declare -A archToCC +archToCC["amd64"]="" +archToCC["arm64"]="aarch64-linux-gnu-gcc" +archToCC["ppc64le"]="powerpc64le-linux-gnu-gcc" + +docker build -t runcdev . + for platform in ${BUILD_PLATFORMS[*]}; do os="${platform%/*}" arch="${platform#*/}" @@ -26,10 +33,9 @@ for platform in ${BUILD_PLATFORMS[*]}; do rm -rf ~/.cache/go-build bin || : rm -rf "_output/${os}/${arch}/runc" || : mkdir -p "_output/${os}/${arch}/runc" - docker run --rm -v $(pwd):/go/src/github.com/opencontainers/runc -w /go/src/github.com/opencontainers/runc golang:1.17 \ + docker run --rm -v $(pwd):/go/src/github.com/opencontainers/runc -w /go/src/github.com/opencontainers/runc runcdev \ /bin/bash -c " - apt-get update && apt-get install libseccomp-dev - GO111MODULE=auto GOOS=${os} GOARCH=${arch} CGO_ENABLED=1 make BUILDTAGS='${BUILDTAGS}' runc && \ + GO111MODULE=auto GOOS=${os} GOARCH=${arch} CC=${archToCC[$arch]} CGO_ENABLED=1 make BUILDTAGS='${BUILDTAGS}' runc && \ mv runc _output/${os}/${arch}/runc/ || : " || echo "fail ${platform}"