use container builder

Signed-off-by: Brooks Newberry <[email protected]>

Makefile

@@ -48,15 +48,19 @@ build-windows-images:                     ## Build only the Windows images and t
 	./scripts/build-windows-images
 
 .PHONY: build-image-runtime
-build-image-runtime:                      ## Build the runtime image
+build-image-runtime: setup-builder        ## Build the runtime image
 	./scripts/build-image-runtime
 
 .PHONY: publish-image-runtime
 publish-image-runtime: build-image-runtime
 	./scripts/publish-image-runtime
 
+.PHONY: build-image-runtime-windows
+build-image-runtime-windows: setup-builder
+	./scripts/build-image-runtime-windows
+
 .PHONY: publish-image-runtime-windows
-publish-image-runtime: build-image-runtime-windows
+publish-image-runtime-windows: build-image-runtime-windows
 	./scripts/publish-image-runtime-windows
 
 .PHONY: validate
@@ -141,7 +145,7 @@ package-windows-images: build-windows-images		## Package Windows crane images fo
 	./scripts/package-windows-images
 
 .PHONY: package-image-runtime
-package-image-runtime: build-image-runtime		## Package runtime image for GH Actions testing
+package-image-runtime: setup-builder build-image-runtime		## Package runtime image for GH Actions testing
 	./scripts/package-image-runtime
 
 .PHONY: package-bundle
@@ -167,6 +171,10 @@ test-docker:
 checksum:
 	./scripts/checksum
 
+.PHONY: setup-builder
+setup-builder:
+	./scripts/setup-docker-builder
+
 ./.dapper:
 	@echo Downloading dapper
 	@curl -sL https://releases.rancher.com/dapper/v0.5.8/dapper-$$(uname -s)-$$(uname -m) > .dapper.tmp

scripts/build-image-runtime

@@ -6,8 +6,8 @@ cd $(dirname $0)/..
 source ./scripts/version.sh
 
 DOCKER_BUILDKIT=${DOCKER_BUILDKIT:-1} docker image build \
-    ${IID_FILE_FLAG} \
     --sbom=true \
+    ${IID_FILE_FLAG} \
     --attest type=provenance,mode=max \
     --build-arg TAG=${VERSION} \
     --build-arg KUBERNETES_VERSION=${KUBERNETES_VERSION} \

scripts/setup-docker-builder

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -ex
+
+BUILDER=${BUILDER:-rke2-builder}
+
+docker buildx ls | grep ${BUILDER}|| \
+    docker buildx create --name=${BUILDER} --platform=linux/amd64,linux/arm64
+
+docker buildx use ${BUILDER}