Merge pull request #53 from thomasferrandiz/useCrossCompilation

Use cross-compilation to fix build issues

Author: thomasferrandiz

Dockerfile

@@ -1,28 +1,48 @@
-ARG ARCH="amd64"
 ARG GO_IMAGE=rancher/hardened-build-base:v1.21.10b1
 
-# Build the multus project
-FROM ${GO_IMAGE} as builder
+# Image that provides cross compilation tooling.
+FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.3.0 AS xx
+
+FROM --platform=$BUILDPLATFORM ${GO_IMAGE} as base-builder
+# copy xx scripts to your build stage
+COPY --from=xx / /
+RUN apk add file make git clang lld patch
+ARG TARGETPLATFORM
 RUN set -x && \
-    apk --no-cache add patch
-ARG ARCH
+    xx-apk --no-cache add musl-dev gcc lld 
+
+# Build the multus project
+FROM base-builder as multus-builder
 ARG TAG=v4.0.2
-ENV GOARCH ${ARCH}
-ENV GOOS "linux"
+ARG SRC=github.com/k8snetworkplumbingwg/multus-cni
+ARG PKG=github.com/k8snetworkplumbingwg/multus-cni
+RUN git clone --depth=1 https://${SRC}.git $GOPATH/src/${PKG}
+WORKDIR $GOPATH/src/${PKG}
 # patch to solve https://github.com/rancher/rke2/issues/4568
 # to be removed once upstream merges the fix
 # https://github.com/k8snetworkplumbingwg/multus-cni/pull/1137
 COPY self_delegation_bug.patch /tmp
-RUN git clone --depth=1 https://github.com/k8snetworkplumbingwg/multus-cni && \
-    cd multus-cni && \
-    git fetch --all --tags --prune && \
+
+RUN git fetch --all --tags --prune && \
     git checkout tags/${TAG} -b ${TAG} && \
-    git apply /tmp/self_delegation_bug.patch && \
+    git apply /tmp/self_delegation_bug.patch
+RUN go mod download
+# cross-compilation setup
+ARG TARGETARCH
+
+RUN xx-go --wrap && \
     ./hack/build-go.sh
+RUN xx-verify --static bin/thin_entrypoint bin/multus
+
+FROM ${GO_IMAGE} as strip_binary
+#strip needs to run on TARGETPLATFORM, not BUILDPLATFORM
+COPY --from=multus-builder /go/src/github.com/k8snetworkplumbingwg/multus-cni/bin/thin_entrypoint /thin_entrypoint
+COPY --from=multus-builder /go/src/github.com/k8snetworkplumbingwg/multus-cni/bin/multus /multus
+RUN strip /thin_entrypoint /multus
 
 # Create the multus image
 FROM scratch as multus-cni
-COPY --from=builder  /go/multus-cni/bin/multus /usr/src/multus-cni/bin/multus
-COPY --from=builder  /go/multus-cni/LICENSE /usr/src/multus-cni/LICENSE
-COPY --from=builder  /go/multus-cni/bin/thin_entrypoint /
+COPY --from=strip_binary  /multus /usr/src/multus-cni/bin/multus
+COPY --from=multus-builder  /go/src/github.com/k8snetworkplumbingwg/multus-cni/LICENSE /usr/src/multus-cni/LICENSE
+COPY --from=strip_binary    /thin_entrypoint /
 ENTRYPOINT ["/thin_entrypoint"]

Makefile

@@ -12,6 +12,8 @@ endif
 
 BUILD_META=-build$(shell date +%Y%m%d)
 ORG ?= rancher
+PKG ?= github.com/k8snetworkplumbingwg/multus-cni
+SRC ?= github.com/k8snetworkplumbingwg/multus-cni
 TAG ?= ${GITHUB_ACTION_TAG}
 
 ifeq ($(TAG),)
@@ -29,7 +31,6 @@ image-build:
 		--build-arg PKG=$(PKG) \
 		--build-arg SRC=$(SRC) \
 		--build-arg TAG=$(TAG:$(BUILD_META)=) \
-		--build-arg ARCH=$(ARCH) \
 		--target multus-cni \
 		--tag $(ORG)/hardened-multus-cni:$(TAG) \
 		--tag $(ORG)/hardened-multus-cni:$(TAG)-$(ARCH) \