github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update gcloud docker commands to use gcloud docker -- ARGS

Browse Source 
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>
This commit is contained in:
Jess Frazelle
2016-10-10 13:42:29 -07:00
parent c2027108cd
commit cde5559d09
48 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/images/clusterapi-tester/Makefile
View File

@@ -25,7 +25,7 @@ container: main
docker build -t $(PREFIX):$(TAG) .
push: container
gcloud docker push $(PREFIX):$(TAG)
gcloud docker -- push $(PREFIX):$(TAG)
clean:
rm -f main

2
test/images/dnsutils/Makefile
View File

@@ -22,6 +22,6 @@ image:
docker build -t $(PREFIX)/dnsutils .
push: image
gcloud docker push $(PREFIX)/dnsutils
gcloud docker -- push $(PREFIX)/dnsutils
clean:

2
test/images/fakegitserver/Makefile
View File

@@ -24,7 +24,7 @@ image:
docker build -t $(PREFIX)/$(IMAGE):$(TAG) .
push: image
gcloud docker push $(PREFIX)/$(IMAGE):$(TAG)
gcloud docker -- push $(PREFIX)/$(IMAGE):$(TAG)
all: push

2
test/images/goproxy/Makefile
View File

@@ -24,7 +24,7 @@ image: goproxy
docker build -t $(PREFIX)/goproxy:$(TAG) .
push: image
gcloud docker push $(PREFIX)/goproxy:$(TAG)
gcloud docker -- push $(PREFIX)/goproxy:$(TAG)
clean:
rm -f goproxy

2
test/images/hostexec/Makefile
View File

@@ -24,7 +24,7 @@ image:
docker build -t $(PREFIX)/hostexec:$(TAG) .
push: image
gcloud docker push $(PREFIX)/hostexec:$(TAG)
gcloud docker -- push $(PREFIX)/hostexec:$(TAG)
clean:
rm -f hostexec

4
test/images/iperf/Makefile
View File

@@ -25,7 +25,7 @@ image:
docker tag $(PREFIX)/${IMAGE} $(PREFIX)/${IMAGE}:$(TAG) # Add the version tag to the latest image
push: image
gcloud docker push $(PREFIX)/${IMAGE} # Push image tagged as latest to repository
gcloud docker push $(PREFIX)/${IMAGE}:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
gcloud docker -- push $(PREFIX)/${IMAGE} # Push image tagged as latest to repository
gcloud docker -- push $(PREFIX)/${IMAGE}:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
clean:

2
test/images/jessie-dnsutils/Makefile
View File

@@ -22,6 +22,6 @@ image:
docker build -t $(PREFIX)/jessie-dnsutils .
push: image
gcloud docker push $(PREFIX)/jessie-dnsutils
gcloud docker -- push $(PREFIX)/jessie-dnsutils
clean:

2
test/images/mount-tester-user/Makefile
View File

@@ -21,6 +21,6 @@ image:
sudo docker build -t $(PREFIX)/mounttest-user:$(TAG) .
push: image
gcloud docker push $(PREFIX)/mounttest-user:$(TAG)
gcloud docker -- push $(PREFIX)/mounttest-user:$(TAG)
clean:

2
test/images/mount-tester/Makefile
View File

@@ -24,7 +24,7 @@ image: mt
sudo docker build -t $(PREFIX)/mounttest:$(TAG) .
push: image
gcloud docker push $(PREFIX)/mounttest:$(TAG)
gcloud docker -- push $(PREFIX)/mounttest:$(TAG)
clean:
rm -f mt

2
test/images/n-way-http/Makefile
View File

@@ -25,7 +25,7 @@ container: server
docker build -t $(PREFIX):$(TAG) .
push: container
gcloud docker push $(PREFIX):$(TAG)
gcloud docker -- push $(PREFIX):$(TAG)
clean:
rm -f server

2
test/images/netexec/Makefile
View File

@@ -27,7 +27,7 @@ image: netexec
docker build -t $(PREFIX)/netexec:$(TAG) .
push: image
gcloud docker push $(PREFIX)/netexec:$(TAG)
gcloud docker -- push $(PREFIX)/netexec:$(TAG)
clean:
rm -f netexec

2
test/images/network-tester/Makefile
View File

@@ -26,7 +26,7 @@ image: webserver
docker build -t $(PREFIX)/nettest:$(TAG) .
push: image
gcloud docker push $(PREFIX)/nettest:$(TAG)
gcloud docker -- push $(PREFIX)/nettest:$(TAG)
clean:
rm -f webserver

2
test/images/pets/redis/Makefile
View File

@@ -21,7 +21,7 @@ container:
docker build -t $(PREFIX):$(TAG) .
push: container
gcloud docker push $(PREFIX):$(TAG)
gcloud docker -- push $(PREFIX):$(TAG)
clean:
docker rmi $(PREFIX):$(TAG)

2
test/images/pets/zookeeper/Makefile
View File

@@ -21,7 +21,7 @@ container:
docker build -t $(PREFIX):$(TAG) .
push: container
gcloud docker push $(PREFIX):$(TAG)
gcloud docker -- push $(PREFIX):$(TAG)
clean:
docker rmi $(PREFIX):$(TAG)

2
test/images/port-forward-tester/Makefile
View File

@@ -24,7 +24,7 @@ image: portforwardtester
docker build -t $(PREFIX)/portforwardtester:$(TAG) .
push: image
gcloud docker push $(PREFIX)/portforwardtester:$(TAG)
gcloud docker -- push $(PREFIX)/portforwardtester:$(TAG)
clean:
rm -f portforwardtester

2
test/images/porter/Makefile
View File

@@ -41,7 +41,7 @@ image:
push:
$(if $(TAG),,$(error TAG is not defined. Use 'make tag' after committing changes to see a suggestion))
gcloud docker push $(PREFIX)/porter:$(TAG)
gcloud docker -- push $(PREFIX)/porter:$(TAG)
clean:
rm -f porter

4
test/images/resource-consumer/Makefile
View File

@@ -32,8 +32,8 @@ run_container:
docker run --publish=8080:8080 $(PREFIX)/resource_consumer:$(TAG)
push:
gcloud docker push ${PREFIX}/resource_consumer:${TAG}
gcloud docker push ${PREFIX}/resource_consumer/controller:${TAG}
gcloud docker -- push ${PREFIX}/resource_consumer:${TAG}
gcloud docker -- push ${PREFIX}/resource_consumer/controller:${TAG}
clean:
rm -f consumer

4
test/images/serve_hostname/Makefile
View File

@@ -90,9 +90,9 @@ container: .container-$(ARCH)
push: .push-$(ARCH)
.push-$(ARCH): .container-$(ARCH)
gcloud docker push $(IMAGE):$(TAG)
gcloud docker -- push $(IMAGE):$(TAG)
if [ -n "$(TEST_REGISTRY)" ]; then \
gcloud docker push $(TEST_IMAGE):$(TAG) ;\
gcloud docker -- push $(TEST_IMAGE):$(TAG) ;\
fi
clean:

4
test/images/volumes-tester/ceph/Makefile
View File

@@ -24,7 +24,7 @@ image:
docker tag $(PREFIX)/volume-ceph $(PREFIX)/volume-ceph:$(TAG) # Add the version tag to the latest image
push: image
gcloud docker push $(PREFIX)/volume-ceph # Push image tagged as latest to repository
gcloud docker push $(PREFIX)/volume-ceph:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
gcloud docker -- push $(PREFIX)/volume-ceph # Push image tagged as latest to repository
gcloud docker -- push $(PREFIX)/volume-ceph:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
clean:

6
test/images/volumes-tester/gluster/Makefile
View File

@@ -21,10 +21,10 @@ container: image
image:
docker build -t $(PREFIX)/volume-gluster . # Build new image and automatically tag it as latest
docker tag $(PREFIX)/volume-gluster $(PREFIX)/volume-gluster:$(TAG) # Add the version tag to the latest image
docker tag $(PREFIX)/volume-gluster $(PREFIX)/volume-gluster:$(TAG) # Add the version tag to the latest image
push: image
gcloud docker push $(PREFIX)/volume-gluster # Push image tagged as latest to repository
gcloud docker push $(PREFIX)/volume-gluster:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
gcloud docker -- push $(PREFIX)/volume-gluster # Push image tagged as latest to repository
gcloud docker -- push $(PREFIX)/volume-gluster:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
clean:

4
test/images/volumes-tester/iscsi/Makefile
View File

@@ -34,8 +34,8 @@ block:
push: image
# Push image tagged as latest to repository
gcloud docker push $(PREFIX)/volume-iscsi
gcloud docker -- push $(PREFIX)/volume-iscsi
# Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
gcloud docker push $(PREFIX)/volume-iscsi:$(TAG)
gcloud docker -- push $(PREFIX)/volume-iscsi:$(TAG)
clean:

4
test/images/volumes-tester/nfs/Makefile
View File

@@ -24,7 +24,7 @@ image:
docker tag $(PREFIX)/volume-nfs $(PREFIX)/volume-nfs:$(TAG) # Add the version tag to the latest image
push: image
gcloud docker push $(PREFIX)/volume-nfs # Push image tagged as latest to repository
gcloud docker push $(PREFIX)/volume-nfs:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
gcloud docker -- push $(PREFIX)/volume-nfs # Push image tagged as latest to repository
gcloud docker -- push $(PREFIX)/volume-nfs:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
clean:

6
test/images/volumes-tester/rbd/Makefile
View File

@@ -22,7 +22,7 @@ container: image
image:
# Build new image and automatically tag it as latest
docker build -t $(PREFIX)/volume-rbd .
# Add the version tag to the latest image
# Add the version tag to the latest image
docker tag $(PREFIX)/volume-rbd $(PREFIX)/volume-rbd:$(TAG)
block:
@@ -34,8 +34,8 @@ block:
push: image
# Push image tagged as latest to repository
gcloud docker push $(PREFIX)/volume-rbd
gcloud docker -- push $(PREFIX)/volume-rbd
# Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
gcloud docker push $(PREFIX)/volume-rbd:$(TAG)
gcloud docker -- push $(PREFIX)/volume-rbd:$(TAG)
clean: