From 75e96fd2269e272c459adbbb6475280253933c2c Mon Sep 17 00:00:00 2001
From: Jess Frazelle <acidburn@google.com>
Date: Mon, 10 Oct 2016 13:42:29 -0700
Subject: [PATCH] Update `gcloud docker` commands to use `gcloud docker --
 ARGS`

We can then avoid the following warning:
```
WARNING: The '--' argument must be specified between gcloud specific args on the left and DOCKER_ARGS on the right. IMPORTANT: previously, commands allowed the omission of the --, and unparsed arguments were treated as implementation args. This usage is being deprecated and will be removed in March 2017.
This will be strictly enforced in March 2017. Use 'gcloud beta docker' to see new behavior.
```

Signed-off-by: Jess Frazelle <acidburn@google.com>
---
 cluster-dns/images/backend/Makefile  | 2 +-
 cluster-dns/images/frontend/Makefile | 2 +-
 explorer/Makefile                    | 2 +-
 guestbook-go/_src/Makefile           | 6 +++---
 kubectl-container/Makefile           | 2 +-
 meteor/README.md                     | 2 +-
 storage/cassandra/image/Makefile     | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cluster-dns/images/backend/Makefile b/cluster-dns/images/backend/Makefile
index b029931b..14e1bcde 100644
--- a/cluster-dns/images/backend/Makefile
+++ b/cluster-dns/images/backend/Makefile
@@ -22,6 +22,6 @@ image:
 	docker build -t $(PREFIX)/$(IMAGE):$(TAG) .
 
 push: image
-	gcloud docker push $(PREFIX)/$(IMAGE)
+	gcloud docker -- push $(PREFIX)/$(IMAGE)
 
 clean:
diff --git a/cluster-dns/images/frontend/Makefile b/cluster-dns/images/frontend/Makefile
index 5bd4443a..ae8847e3 100644
--- a/cluster-dns/images/frontend/Makefile
+++ b/cluster-dns/images/frontend/Makefile
@@ -22,6 +22,6 @@ image:
 	docker build -t $(PREFIX)/$(IMAGE):$(TAG) .
 
 push: image
-	gcloud docker push $(PREFIX)/$(IMAGE)
+	gcloud docker -- push $(PREFIX)/$(IMAGE)
 
 clean:
diff --git a/explorer/Makefile b/explorer/Makefile
index 36f7494f..28a3b4dd 100644
--- a/explorer/Makefile
+++ b/explorer/Makefile
@@ -24,7 +24,7 @@ container: explorer
 	docker build -t gcr.io/google_containers/explorer:$(TAG) .
 
 push: container
-	gcloud docker push gcr.io/google_containers/explorer:$(TAG)
+	gcloud docker -- push gcr.io/google_containers/explorer:$(TAG)
 
 clean:
 	rm -f explorer
diff --git a/guestbook-go/_src/Makefile b/guestbook-go/_src/Makefile
index e5db478a..31c04761 100644
--- a/guestbook-go/_src/Makefile
+++ b/guestbook-go/_src/Makefile
@@ -28,10 +28,10 @@ build:
 
 # push the image to an registry
 push:
-	gcloud docker push ${REGISTRY}/guestbook:${VERSION}
-	
+	gcloud docker -- push ${REGISTRY}/guestbook:${VERSION}
+
 # remove previous images and containers
-clean: 
+clean:
 	docker rm -f ${REGISTRY}/guestbook-builder 2> /dev/null || true
 	docker rmi -f ${REGISTRY}/guestbook-builder || true
 	docker rmi -f "${REGISTRY}/guestbook:${VERSION}" || true
diff --git a/kubectl-container/Makefile b/kubectl-container/Makefile
index e3b21a5b..bcdd62c1 100644
--- a/kubectl-container/Makefile
+++ b/kubectl-container/Makefile
@@ -41,7 +41,7 @@ container:
 
 push: container
 	$(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion))
-	gcloud docker push gcr.io/google_containers/kubectl:$(TAG)
+	gcloud docker -- push gcr.io/google_containers/kubectl:$(TAG)
 
 clean:
 	rm -f kubectl
diff --git a/meteor/README.md b/meteor/README.md
index 94c393af..d8873b5b 100644
--- a/meteor/README.md
+++ b/meteor/README.md
@@ -131,7 +131,7 @@ your app image with your project ID, and push to GCR. Replace
 
 ```
 docker tag my-meteor gcr.io/<project>/my-meteor
-gcloud docker push gcr.io/<project>/my-meteor
+gcloud docker -- push gcr.io/<project>/my-meteor
 ```
 
 Running
diff --git a/storage/cassandra/image/Makefile b/storage/cassandra/image/Makefile
index c016cac2..7cae1f5e 100644
--- a/storage/cassandra/image/Makefile
+++ b/storage/cassandra/image/Makefile
@@ -29,6 +29,6 @@ build: kubernetes-cassandra.jar
 	docker build -t ${PROJECT}/cassandra:${VERSION} .
 
 push: build
-	gcloud docker push ${PROJECT}/cassandra:${VERSION}
+	gcloud docker -- push ${PROJECT}/cassandra:${VERSION}
 
 .PHONY: all build push