From 50983956f06d4b1ff9c2147c7a604c8df6759a95 Mon Sep 17 00:00:00 2001
From: Adam Boutcher <adam.j.boutcher@durham.ac.uk>
Date: Sun, 15 Aug 2021 20:01:17 +0100
Subject: [PATCH] Docker push via cache in the build process.

---
 .github/workflows/2_unstable.yml | 8 ++++----
 Makefile                         | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/2_unstable.yml b/.github/workflows/2_unstable.yml
index ce35adbc..991b5be6 100644
--- a/.github/workflows/2_unstable.yml
+++ b/.github/workflows/2_unstable.yml
@@ -455,10 +455,10 @@ jobs:
             buildx-docker-master
 
       - name: Docker Build :base
-        run: make buildx-base --cache-to=type=local,dest=cache,mode=max
+        run: make buildx-base
 
       - name: Docker Build :dev
-        run: make buildx-dev --cache-to=type=local,dest=cache,mode=max
+        run: make buildx-dev
 
       - name: Docker Login
         env:
@@ -467,10 +467,10 @@ jobs:
         run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
 
       - name: Docker Upload :base
-        run: docker buildx build --push --cache-from=type=local,src=cache
+        run: docker buildx build --push --cache-from=type=local,src=/tmp/.buildx-cache
 
       - name: Docker Upload :dev
-        run: docker buildx build --push --cache-from=type=local,src=cache
+        run: docker buildx build --push --cache-from=type=local,src=/tmp/.buildx-cache
 
 
 #  sentry-release:
diff --git a/Makefile b/Makefile
index dd03484e..b724e71e 100644
--- a/Makefile
+++ b/Makefile
@@ -383,19 +383,19 @@ xgo-latest:
 buildx-latest: multiarch
 	docker buildx create --name statping-latest
 	docker buildx inspect --builder statping-latest --bootstrap
-	docker buildx build --builder statping-latest --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache" --pull --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile -t statping-ng/statping-ng:latest -t statping-ng/statping-ng:v${VERSION} --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} .
+	docker buildx build --builder statping-latest --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache" --pull --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile -t statping-ng/statping-ng:latest -t statping-ng/statping-ng:v${VERSION} --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} .
 	docker buildx rm statping-latest
 
 buildx-dev: multiarch
 	docker buildx create --name statping-dev
 	docker buildx inspect --builder statping-dev --bootstrap
-	docker buildx build --builder statping-dev --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache" --pull --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile -t statping-ng/statping-ng:dev --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} .
+	docker buildx build --builder statping-dev --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache" --pull --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile -t statping-ng/statping-ng:dev --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} .
 	docker buildx rm statping-dev
 
 buildx-base: multiarch
 	docker buildx create --name statping-base
 	docker buildx inspect --builder statping-base --bootstrap
-	docker buildx build --builder statping-base --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache" --pull --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile.base -t statping-ng/statping-ng:base --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} .
+	docker buildx build --builder statping-base --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache" --pull --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile.base -t statping-ng/statping-ng:base --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} .
 	docker buildx rm statping-base
 
 multiarch: