fix builds with new builder docker/buildx#138

Signed-off-by: Sandor Szücs <[email protected]>

delivery.yaml

@@ -7,7 +7,7 @@ pipeline:
   - desc: build-push
     cmd: |
       apt-get update  -o Acquire::http::AllowRedirect=false
-      apt-get install -o Acquire::http::AllowRedirect=false -y bzr redis-server jq
+      apt-get install -o Acquire::http::AllowRedirect=false -y bzr redis-server jq qemu-user-static
       if [[ $CDP_TARGET_BRANCH == master && ! $CDP_PULL_REQUEST_NUMBER ]]; then
         LATEST_VERSION=$(git describe --tags --always | awk -F \- '{print $1}')
         CUR_PART=$(echo $LATEST_VERSION | awk -F . '{print $1"."$2}')
@@ -27,6 +27,7 @@ pipeline:
       git status
       git diff
       cd packaging && make docker.build.amd64 && git status && git diff && make docker.push.amd64
+      make docker.build.arm64 # test buildx
       if [[ $CDP_TARGET_BRANCH == master && ! $CDP_PULL_REQUEST_NUMBER ]]; then
         echo "Created docker image registry.opensource.zalan.do/pathfinder/skipper:${RELEASE_VERSION}"
         echo "Creating docker image registry.opensource.zalan.do/pathfinder/skipper-arm64:${RELEASE_VERSION}"

packaging/Makefile

@@ -49,10 +49,15 @@ docker.push.armv7: docker.build.armv7
 # https://docs.docker.com/build/working-with-build/
 # ~/.docker/config.json add: "experimental": "enabled",
 docker.build.enable:
+	[ $$(which qemu-user-static) ] || echo "please install qemu-user-static"
 	[ $$(which jq) ] || echo "please install jq"
 	[ -d $$HOME/.docker ] || mkdir $$HOME/.docker
 	[ -f $$HOME/.docker/config.json ] || touch $$HOME/.docker/config.json
 	if [ -s $$HOME/.docker/config.json ]; then jq -r '. += {experimental: "enabled"}' $$HOME/.docker/config.json > $$HOME/.docker/config.json.new; mv $$HOME/.docker/config.json.new $$HOME/.docker/config.json; else echo '{"experimental": "enabled"}' >$$HOME/.docker/config.json; fi
+	docker buildx create skipper
+	docker buildx use skipper
+	docker buildx inspect --bootstrap
+	docker buildx ls
 
 build.linux: $(SOURCES) build.linux.amd64 build.linux.arm64 build.linux.armv7