build for arm64 too

Author: aojea

Dockerfile

@@ -2,18 +2,23 @@
 
 # STEP 1: Build kindnetd binary
 FROM --platform=$BUILDPLATFORM golang:1.23 AS builder
+ARG TARGETARCH BUILDPLATFORM
 # copy in sources
 WORKDIR /src
 COPY . .
 # build
-ARG TARGETARCH
 RUN CGO_ENABLED=0 GOARCH=$TARGETARCH go build -o /go/bin/kindnetd ./cmd/kindnetd
 WORKDIR /src/cmd/cni-kindnet
 # sqlite requires CGO
-RUN CGO_ENABLED=1 GOARCH=$TARGETARCH go build -o /go/bin/cni-kindnet .
+RUN if [ "$TARGETARCH" = "arm64" ] ; then \
+      apt-get update && apt-get -y install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu ;\
+      CC=aarch64-linux-gnu-gcc CGO_ENABLED=1 GOARCH=$TARGETARCH go build -o /go/bin/cni-kindnet . ;\
+  else \
+      CGO_ENABLED=1 GOARCH=$TARGETARCH go build -o /go/bin/cni-kindnet . ;\
+  fi
 
 # STEP 2: Build small image
-FROM registry.k8s.io/build-image/distroless-iptables:v0.6.5
+FROM --platform=${BUILDPLATFORM} registry.k8s.io/build-image/distroless-iptables:v0.6.6
 COPY --from=builder --chown=root:root /go/bin/kindnetd /bin/kindnetd
 COPY --from=builder --chown=root:root /go/bin/cni-kindnet /opt/cni/bin/cni-kindnet
 CMD ["/bin/kindnetd"]

Makefile

@@ -22,7 +22,7 @@ lint:
 	hack/lint.sh
 
 update:
-	go mod tidy && go mod vendor
+	go mod tidy
 
 # get image name from directory we're building
 IMAGE_NAME=kindnetd
@@ -32,9 +32,11 @@ REGISTRY?=ghcr.io/aojea
 TAG?=$(shell echo "$$(date +v%Y%m%d)-$$(git describe --always --dirty)")
 # the full image tag
 IMAGE?=$(REGISTRY)/$(IMAGE_NAME):$(TAG)
-
+PLATFORMS?=linux/amd64,linux/arm64
 # required to enable buildx
 export DOCKER_CLI_EXPERIMENTAL=enabled
+
 image-build:
-# docker buildx build --platform=${PLATFORMS} $(OUTPUT) --progress=$(PROGRESS) -t ${IMAGE} --pull $(EXTRA_BUILD_OPT) .
-	docker build . -t ${IMAGE} --load
+	docker buildx build . \
+		--platform="${PLATFORMS}" \
+		--tag="${IMAGE}"