swiched to buildkit for multi-arch builds

.travis.yml

@@ -2,10 +2,6 @@ sudo: required
 services:
 - docker
 
-arch:
-- amd64
-- arm64
-
 script:
 - make container
 
@@ -20,8 +16,11 @@ deploy:
     on:
       branch: master
       tags: true
+
 env:
   global:
+  - TARGET=linux/arm64,linux/amd64 # multiple architectures build in one step
+  - BUILD_FLAGS=--no-cache # no --load flag, with multiple architectures
   - secure: hs8m9KkJ+sBwQr4FF/ZGFDpK25n4K3q6R/KU0q++m27G0D2XtO+JeTQnRi8cV/8JGcYClBUIqkIXoKxpohuZ+LrTUGtPL/KUjsMshV59PTqvCrlkCmUfMrM0DowwVW1O7g2T+gPsr0rj++FUxTtk0s12sHZdxTDFrNTtdFD6Et6BXO6UIlDy2PhhLXNf7kxa7OpWPOWXosU6bBuj4NjaGXpYSWIJPnxMbmfGcmOpudPeRJGJsqDmHy3YKZ8IDWKOsDNOKmltOAzG3qhQP2DhHfjC4Tpmou3AOD2SdI5ekwPvQpa4cWo7LOw6l6PYtz7MhfchnQR5+KXvTu+JvGt3LDJeuE8PmFzefOxO2fUoEjNGFa3hRxGzJ4UyzxyXrqwPH4XBm4x1sqVFqMEwkY3AsuACGk4+1CSVkXORtE4GrhLBi52cJ7EI0Qq02+WjSKGppRg1OjIX0ZRG/mGOnt/qqHLSfxmRJGPIgtIALtsTbbHZwQN67se08p1+4JHgQ6G4tEV27Kmsu6tz2oAJrOuPrhCNltRFPhYw3A4U4jIO9ziMJHSMLtsHu48cOTtw2tVNW4mss6wadqpL4akX7uEiFoBrf0YFQ1cpImtpjRcAV8izBFiLYYLnQrnXUAPDFIEPEgyax8JATWVCS1qnfbdB3++6CUEMceTpBpY7dQVimKY=
   - secure: eGI6porT74KMcar09zF6UQNpeQ28/2zrVRuxRV0jjQ2+gAlJrbZjROZg8vZ9jKimWoks8MAGdo1y7s99pGVJ8yOT+yHX2C3ZOStFdLWTXVxeEZrsg0xd11qKB7/RmlLt0/Nsy1lvA/UM7h4ydAhIXO7jxSxltHyyUaW8SrUGpku6prpUJGQVAuJgK6MdBSw+H5kjk9FLyQxTs54h+GQBoFtTucmf+DLdSkahH6+La7zHYitNr/Q++ghIbzvwuHzJ24ZCKJfY3mlwIymcoGtflULwuClJnkp0I07rht2mgrx9/SXzOfstBcT85OSsSOAUzv0RjTx34WxaanfD/cgk1jr51+jAXbHq7mpcFpc7MxX+uS3r+LpSksJe6MTcvJB03zUkHm0Y8qsg1GnmDeyY61CBTKi0QIR5+RrwBGQKBzuUFvq90fhBFTBOGEmxRMx7IQNT+o3OcugaAirfYSIfd1aFcBUZml/KxVTTTjGooyHaqYlDH1TuZ489/4H3H2VL/Waf+QcB5e+c7VYvl7o/8ZpHxmRon0dlUxeS2yqowex1lB9ZvXaXUcUf9DZXsMB9Iym1HR1enwyDxXlgs9H72eksLX08mY703l2sujQrzZnQg3p1w11lK7aDaYqX/HguSakkiwziwoCTzfphVxrjQyYZbgPkPMWnUazf5Im1jmM=
   - secure: STKKi64NfO1X+o6CVUNZaZaTpcxAqQ99PPMA0zSoNwhg+e6xu8rF3maB3GM0EjTYZ4w2hccVp8fyHetsrVJX7sTPoo85dfNzQi8/o0MpLugyKLYytGW+BFJJWcG8SJh+Qp28rLRKD+T38eLuQugwoTPWmVq6H5khR4PCasi+FF4yz1GkdiD2AyOYXAIfH4NvbifuA3U5yvuMtHASRIUGSJJvIMhyALcUC6XxbNXB+Ugvq1RvlkVSEh2sxP24A+A4CERzyQbVEMzC235qucUhwcUne+4EuGPQi+g+P3e5lBmZGf+uYhhncrPJWGZp7/NgI1ClyU5n2VZNCune+IS0E7JsK6umabN2K4385EJqCOwOka1N8q4lvfCkynIIylqSGkRBgsgpDq7e/tYfxr4tl7mCxUyTRGvGKL/0i68rdnllCQ+ndFNS6H0/ltCdHxnac5+tbN10tspdwCAfVu+g4Vgj3Yl4Uk3M5BbS03OIbVB3/dqMRmjBPANEJ267v7JXLcHSCAtONDGwWcGae0ZEUtiVMSPHTqgELPjpHsK0tTmGMFgT9hh27iHyGvBErB+ec7Fz7ayTQUbDK8ZoKwY+isAubUR+pAyB/5dcqwhYYNb041/ScRtfwdHjrheL2V0vFI7SPCavbeCMaY0ZGOySy5WhcvT6V/LayGjpedEj8SA=

Dockerfile

@@ -4,7 +4,7 @@ MAINTAINER Michal Orzechowski <[email protected]>
 
 ARG VCS_REF
 ARG BUILD_DATE
-ARG TARGET_PLATFORM
+ARG TARGETARCH
 
 # Metadata
 LABEL org.label-schema.vcs-ref=$VCS_REF \
@@ -15,7 +15,7 @@ LABEL org.label-schema.vcs-ref=$VCS_REF \
 ENV KUBE_LATEST_VERSION="v1.24.0"
 
 RUN apk add --update --no-cache ca-certificates=20211220-r0 curl=7.80.0-r1 jq=1.6-r1 \
- && curl -L https://storage.googleapis.com/kubernetes-release/release/${KUBE_LATEST_VERSION}/bin/linux/$TARGET_PLATFORM/kubectl -o /usr/local/bin/kubectl \
+ && curl -L https://storage.googleapis.com/kubernetes-release/release/${KUBE_LATEST_VERSION}/bin/linux/$TARGETARCH/kubectl -o /usr/local/bin/kubectl \
  && chmod +x /usr/local/bin/kubectl
 
 ADD wait_for.sh /usr/local/bin/wait_for.sh

Makefile

@@ -1,27 +1,33 @@
 TAG = $(shell git describe --tags --always)
 PREFIX = $(shell git config --get remote.origin.url | tr ':.' '/'  | rev | cut -d '/' -f 3 | rev)
 REPO_NAME = $(shell git config --get remote.origin.url | tr ':.' '/'  | rev | cut -d '/' -f 2 | rev)
-TARGET = $(shell ./evaluate_platform.sh)
+TARGET := $(if $(TARGET),$(TARGET),$(shell ./evaluate_platform.sh))
+VCS_REF = $(shell git rev-parse --short HEAD)
+BUILD_DATE = $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
+BUILD_FLAGS := $(if $(BUILD_FLAGS),$(BUILD_FLAGS),--load --no-cache)
+BUILDER_NAME = k8s-wait-for-builder
+DOCKER_TAGS= $(PREFIX)/$(REPO_NAME):latest $(PREFIX)/$(REPO_NAME):$(TAG) ghcr.io/$(PREFIX)/$(REPO_NAME):latest ghcr.io/$(PREFIX)/$(REPO_NAME):$(TAG)
 
 all: push
 
 container: image
 
 image:
 	@echo TARGET IS $(TARGET)
-	docker build --no-cache -t $(PREFIX)/$(REPO_NAME):latest . --build-arg TARGET_PLATFORM=$(TARGET) # Build new image and automatically tag it as latest
-	docker tag $(PREFIX)/$(REPO_NAME) $(PREFIX)/$(REPO_NAME):$(TAG)  # Add the version tag to the latest image
-	docker tag $(PREFIX)/$(REPO_NAME) ghcr.io/$(PREFIX)/$(REPO_NAME):latest  # Tag latest for ghcr repository
-	docker tag $(PREFIX)/$(REPO_NAME) ghcr.io/$(PREFIX)/$(REPO_NAME):$(TAG)  # Tag the version tag for ghcr repository
+	if ! docker buildx inspect $(BUILDER_NAME) 2> /dev/null ; then docker buildx create --name $(BUILDER_NAME) ; fi
+	docker buildx build \
+		--builder=$(BUILDER_NAME) \
+		--platform=$(TARGET) \
+		--build-arg VCS_REF=$(VCS_REF) \
+		--build-arg BUILD_DATE=$(BUILD_DATE) \
+		$(BUILD_FLAGS) \
+		$(foreach TAG,$(DOCKER_TAGS),--tag $(TAG)) \
+		.
 
-push: push-docker-hub push-ghcr
+push: BUILD_FLAGS:=$(BUILD_FLAGS:--load=)
+push: BUILD_FLAGS+=--push
+push: image
 
-push-docker-hub: image
-	docker push $(PREFIX)/$(REPO_NAME):latest # Push image tagged as latest to docker hub repository
-	docker push $(PREFIX)/$(REPO_NAME):$(TAG) # Push version tagged image to docker hub repository (since this image is already pushed it will simply create or update version tag)
-
-push-ghcr: image
-	docker push ghcr.io/$(PREFIX)/$(REPO_NAME):latest # Push image tagged as latest to ghcr repository
-	docker push ghcr.io/$(PREFIX)/$(REPO_NAME):$(TAG) # Push version tagged image to ghcr repository (since this image is already pushed it will simply create or update version tag)
-
-clean:
+clean:
+	if docker buildx inspect $(BUILDER_NAME) 2> /dev/null ; then docker buildx rm $(BUILDER_NAME) ; fi
+	$(foreach TAG,$(DOCKER_TAGS),docker rmi -f $(TAG); )

evaluate_platform.sh

@@ -20,4 +20,4 @@ if [ -z $PLATFORM ]; then
   exit 1
 fi
 
-echo "$PLATFORM"
+echo "linux/$PLATFORM"