From 69dacd059413bb6db340198402e70783cebb2c6e Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Wed, 25 Jan 2017 10:52:53 +0000
Subject: [PATCH] Restrict CircleCI publishing to AMD64

---
 Makefile                 | 6 ++++--
 bin/circle-deploy-master | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 1c97ea6f..1af0eccd 100644
--- a/Makefile
+++ b/Makefile
@@ -334,10 +334,12 @@ ifneq ($(UPDATE_LATEST),false)
 	$(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker push $(DOCKERHUB_USER)/$*:latest
 endif
 
-# This target pushes a manifest list, and if UPDATE_LATEST is anything but false, also updates the latest tag
-# It takes one parameter, the image name
+# This target pushes a manifest list; it takes one parameter, the image name.
+# The variable UPDATE_LATEST controls whether it updates the versioned tag and/or the latest tag
 $(PUSH_ML): push_ml_%:
+ifneq ($(UPDATE_LATEST),latest-only)
 	$(MANIFEST_TOOL_EXE) push from-args --platforms $(ML_PLATFORMS) --template $(DOCKERHUB_USER)/$*-ARCH:$(WEAVE_VERSION) --target $(DOCKERHUB_USER)/$*:$(WEAVE_VERSION)
+endif
 ifneq ($(UPDATE_LATEST),false)
 	# Push the manifest list to :latest as well
 	$(MANIFEST_TOOL_EXE) push from-args --platforms $(ML_PLATFORMS) --template $(DOCKERHUB_USER)/$*-ARCH:latest --target $(DOCKERHUB_USER)/$*:latest
diff --git a/bin/circle-deploy-master b/bin/circle-deploy-master
index 8afceb87..b0449faa 100755
--- a/bin/circle-deploy-master
+++ b/bin/circle-deploy-master
@@ -8,7 +8,8 @@ if [ -n "$TEST_AND_PUBLISH" ] ; then
     docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
     cd $SRCDIR
     make clean-bin
-    make publish
+    # CircleCI doesn't let us install the qemu module to do ARM docker builds
+    make publish ALL_ARCHITECTURES=amd64 UPDATE_LATEST=latest-only
 fi
 
 cd $SRCDIR