From 84a7672bd50e857dd4e1e1c402a1e410bd9c8a69 Mon Sep 17 00:00:00 2001
From: David Gageot <david@gageot.net>
Date: Wed, 4 Jan 2017 16:56:30 +0100
Subject: [PATCH] Complete target to upload to GCE

 + Use `make gce-upload` to auth and upload
 + Use `FORCE_GSUTIL_AUTH=0 make gce-upload` to
reuse previous auth information

Signed-off-by: David Gageot <david@gageot.net>
---
 alpine/Makefile | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/alpine/Makefile b/alpine/Makefile
index c7e37f713..fcd2b062a 100644
--- a/alpine/Makefile
+++ b/alpine/Makefile
@@ -10,6 +10,9 @@ else
 DIRTY=-dirty
 endif
 
+# By default we want to always auth to GCE to upload moby images
+FORCE_GSUTIL_AUTH ?= 1
+
 # Tag: 22b043cb43f6bc3bc4e1f1ecf9d64932f9325642
 BIOS_IMAGE=mobylinux/mkimage-iso-bios@sha256:7e28f7745fd62284142dce59a137c3331f7673efe8b3f19ee5c65e4cc27ff18c
 
@@ -88,7 +91,15 @@ gce.img.tar.gz: common
 		docker run --rm --net=none --log-driver=none -i $(GCE_IMAGE) >$@
 
 gce-upload:
-	docker run -it --rm --volumes-from gcloud-config google/cloud-sdk gsutil cp -a public-read gce.img.tar.gz gs://docker-for-gcp-images/latest/gce.img.tar.gz
+ifeq ($(FORCE_GSUTIL_AUTH),1)
+	-docker rm gsutil-moby-config 2>/dev/null
+	docker run -it --name gsutil-moby-config google/cloud-sdk gcloud auth login --brief --project=docker-for-gcp
+endif
+	docker run --rm -ti \
+		--volumes-from gsutil-moby-config \
+		-v $(CURDIR)/gce.img.tar.gz:/gce.img.tar.gz \
+		google/cloud-sdk \
+		gsutil cp -a public-read /gce.img.tar.gz gs://docker-for-gcp-templates/latest/gce.img.tar.gz
 
 common: initrd.img
 	$(MAKE) -C kernel