github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #34487 from jessfraz/update-gcloud-docker-commands

Browse Source 
Automatic merge from submit-queue

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.
```
This commit is contained in:
Kubernetes Submit Queue 2016-10-13 07:04:59 -07:00 committed by GitHub
commit 36be3b34f6
48 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/build-image/cross/Makefile
View File

@ -24,4 +24,4 @@ build:
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) . docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
push: build push: build
gcloud docker --server=gcr.io push gcr.io/google_containers/$(IMAGE):$(TAG) gcloud docker --server=gcr.io -- push gcr.io/google_containers/$(IMAGE):$(TAG)

2
build/debian-iptables/Makefile
View File

@ -55,6 +55,6 @@ endif
docker build -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR) docker build -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR)
push: build push: build
gcloud docker push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)
all: push all: push

2
build/kube-dns/Makefile
View File

@ -60,6 +60,6 @@ container:
rm -rf $(TEMP_DIR) rm -rf $(TEMP_DIR)
push: container push: container
gcloud docker push $(REGISTRY)/kubedns-$(ARCH):$(TAG) gcloud docker -- push $(REGISTRY)/kubedns-$(ARCH):$(TAG)
.PHONY: all container push .PHONY: all container push

4
build/pause/Makefile
View File

@ -82,13 +82,13 @@ endif
push: .push-$(ARCH) push: .push-$(ARCH)
.push-$(ARCH): .container-$(ARCH) .push-$(ARCH): .container-$(ARCH)
gcloud docker push $(IMAGE):$(TAG) gcloud docker -- push $(IMAGE):$(TAG)
touch $@ touch $@
push-legacy: .push-legacy-$(ARCH) push-legacy: .push-legacy-$(ARCH)
.push-legacy-$(ARCH): .container-$(ARCH) .push-legacy-$(ARCH): .container-$(ARCH)
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
gcloud docker push $(LEGACY_AMD64_IMAGE):$(TAG) gcloud docker -- push $(LEGACY_AMD64_IMAGE):$(TAG)
endif endif
touch $@ touch $@

4
cluster/addons/addon-manager/Makefile
View File

@ -63,11 +63,11 @@ endif
docker build -t $(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR) docker build -t $(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR)
push: build push: build
gcloud docker push $(IMAGE)-$(ARCH):$(VERSION) gcloud docker -- push $(IMAGE)-$(ARCH):$(VERSION)
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
# Backward compatibility. TODO: deprecate this image tag # Backward compatibility. TODO: deprecate this image tag
docker tag -f $(IMAGE)-$(ARCH):$(VERSION) $(IMAGE):$(VERSION) docker tag -f $(IMAGE)-$(ARCH):$(VERSION) $(IMAGE):$(VERSION)
gcloud docker push $(IMAGE):$(VERSION) gcloud docker -- push $(IMAGE):$(VERSION)
endif endif
clean: clean:

2
cluster/addons/fluentd-elasticsearch/es-image/Makefile
View File

@ -22,7 +22,7 @@ build: elasticsearch_logging_discovery
docker build -t gcr.io/google_containers/elasticsearch:$(TAG) . docker build -t gcr.io/google_containers/elasticsearch:$(TAG) .
push: push:
gcloud docker push gcr.io/google_containers/elasticsearch:$(TAG) gcloud docker -- push gcr.io/google_containers/elasticsearch:$(TAG)
elasticsearch_logging_discovery: elasticsearch_logging_discovery:
go build elasticsearch_logging_discovery.go go build elasticsearch_logging_discovery.go

6
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View File

@ -17,8 +17,8 @@
IMAGE = fluentd-elasticsearch IMAGE = fluentd-elasticsearch
TAG = 1.19 TAG = 1.19
build: build:
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) . docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
push: push:
gcloud docker --server=gcr.io push gcr.io/google_containers/$(IMAGE):$(TAG) gcloud docker --server=gcr.io -- push gcr.io/google_containers/$(IMAGE):$(TAG)

2
cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
View File

@ -20,4 +20,4 @@ build:
docker build -t gcr.io/google_containers/kibana:$(TAG) . docker build -t gcr.io/google_containers/kibana:$(TAG) .
push: push:
gcloud docker push gcr.io/google_containers/kibana:$(TAG) gcloud docker -- push gcr.io/google_containers/kibana:$(TAG)

4
cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
View File

@ -24,7 +24,7 @@
# 4. Test etc. # 4. Test etc.
# 5. Issue PR. # 5. Issue PR.
# 6. When PR is approved make the gcr.io version of the image: make build push # 6. When PR is approved make the gcr.io version of the image: make build push
# 7. Revert the referendes to kubernetes/fluentd-gcp:$(TAG) to gcr.io/google_containers/fluentd-gcp:$(TAG) # 7. Revert the referendes to kubernetes/fluentd-gcp:$(TAG) to gcr.io/google_containers/fluentd-gcp:$(TAG)
.PHONY: kbuild kpush .PHONY: kbuild kpush
@ -47,4 +47,4 @@ build:
push: push:
gcloud docker push gcr.io/google_containers/fluentd-gcp:$(TAG) gcloud docker -- push gcr.io/google_containers/fluentd-gcp:$(TAG)

2
cluster/addons/python-image/Makefile
View File

@ -21,5 +21,5 @@ build:
docker build -t "$(IMAGE):$(VERSION)" . docker build -t "$(IMAGE):$(VERSION)" .
push: push:
gcloud docker push "$(IMAGE):$(VERSION)" gcloud docker -- push "$(IMAGE):$(VERSION)"

2
cluster/addons/registry/images/Makefile
View File

@ -21,4 +21,4 @@ build:
docker build -t $(REPO):$(TAG) . docker build -t $(REPO):$(TAG) .
push: push:
gcloud docker push $(REPO):$(TAG) gcloud docker -- push $(REPO):$(TAG)

2
cluster/images/etcd-empty-dir-cleanup/Makefile
View File

@ -29,4 +29,4 @@ build: clean
rm -rf etcdctl etcd-v$(ETCD_VERSION)-linux-amd64 etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz rm -rf etcdctl etcd-v$(ETCD_VERSION)-linux-amd64 etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz
push: build push: build
gcloud docker push $(IMAGE):$(TAG) gcloud docker -- push $(IMAGE):$(TAG)

6
cluster/images/etcd/Makefile
View File

@ -72,7 +72,7 @@ ifeq ($(ARCH),amd64)
cp $(TEMP_DIR)/etcdctl $(TEMP_DIR)/etcdctl-$$tag; \ cp $(TEMP_DIR)/etcdctl $(TEMP_DIR)/etcdctl-$$tag; \
done done
else else
# Download etcd in a golang container and cross-compile it statically # Download etcd in a golang container and cross-compile it statically
# For each release create a tmp dir 'etcd_release_tmp_dir' and unpack the release tar there. # For each release create a tmp dir 'etcd_release_tmp_dir' and unpack the release tar there.
for tag in $(TAGS); do \ for tag in $(TAGS); do \
@ -102,12 +102,12 @@ endif
docker build -t $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(TEMP_DIR) docker build -t $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(TEMP_DIR)
push: build push: build
gcloud docker push $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) gcloud docker -- push $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG)
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
# Backward compatibility. TODO: deprecate this image tag # Backward compatibility. TODO: deprecate this image tag
docker tag $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(REGISTRY)/etcd:$(REGISTRY_TAG) docker tag $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(REGISTRY)/etcd:$(REGISTRY_TAG)
gcloud docker push $(REGISTRY)/etcd:$(REGISTRY_TAG) gcloud docker -- push $(REGISTRY)/etcd:$(REGISTRY_TAG)
endif endif
all: build all: build

4
cluster/images/hyperkube/Makefile
View File

@ -105,10 +105,10 @@ endif
rm -rf "${TEMP_DIR}" rm -rf "${TEMP_DIR}"
push: build push: build
gcloud docker push ${REGISTRY}/hyperkube-${ARCH}:${VERSION} gcloud docker -- push ${REGISTRY}/hyperkube-${ARCH}:${VERSION}
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
docker tag -f ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${REGISTRY}/hyperkube:${VERSION} docker tag -f ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${REGISTRY}/hyperkube:${VERSION}
gcloud docker push ${REGISTRY}/hyperkube:${VERSION} gcloud docker -- push ${REGISTRY}/hyperkube:${VERSION}
endif endif
.PHONY: all .PHONY: all

2
cluster/images/kube-discovery/Makefile
View File

@ -48,6 +48,6 @@ build:
rm -rf "${TEMP_DIR}" rm -rf "${TEMP_DIR}"
push: build push: build
gcloud docker push ${REGISTRY}/kube-discovery-${ARCH}:${VERSION} gcloud docker -- push ${REGISTRY}/kube-discovery-${ARCH}:${VERSION}
.PHONY: all .PHONY: all

2
cluster/images/kubemark/Makefile
View File

@ -17,6 +17,6 @@
all: all:
docker build -t gcr.io/$(PROJECT)/kubemark . docker build -t gcr.io/$(PROJECT)/kubemark .
gcloud docker push gcr.io/$(PROJECT)/kubemark gcloud docker -- push gcr.io/$(PROJECT)/kubemark
.PHONY: all .PHONY: all

2
examples/cluster-dns/images/backend/Makefile
View File

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

2
examples/cluster-dns/images/frontend/Makefile
View File

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

2
examples/explorer/Makefile
View File

@ -24,7 +24,7 @@ container: explorer
docker build -t gcr.io/google_containers/explorer:$(TAG) . docker build -t gcr.io/google_containers/explorer:$(TAG) .
push: container push: container
gcloud docker push gcr.io/google_containers/explorer:$(TAG) gcloud docker -- push gcr.io/google_containers/explorer:$(TAG)
clean: clean:
rm -f explorer rm -f explorer

6
examples/guestbook-go/_src/Makefile
View File

@ -28,10 +28,10 @@ build:
# push the image to an registry # push the image to an registry
push: push:
gcloud docker push ${REGISTRY}/guestbook:${VERSION} gcloud docker -- push ${REGISTRY}/guestbook:${VERSION}
# remove previous images and containers # remove previous images and containers
clean: clean:
docker rm -f ${REGISTRY}/guestbook-builder 2> /dev/null || true docker rm -f ${REGISTRY}/guestbook-builder 2> /dev/null || true
docker rmi -f ${REGISTRY}/guestbook-builder || true docker rmi -f ${REGISTRY}/guestbook-builder || true
docker rmi -f "${REGISTRY}/guestbook:${VERSION}" || true docker rmi -f "${REGISTRY}/guestbook:${VERSION}" || true

2
examples/kubectl-container/Makefile
View File

@ -41,7 +41,7 @@ container:
push: container push: container
$(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion)) $(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: clean:
rm -f kubectl rm -f kubectl

2
examples/meteor/README.md
View File

@ -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 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 Running

2
examples/storage/cassandra/image/Makefile
View File

@ -29,6 +29,6 @@ build: kubernetes-cassandra.jar
docker build -t ${PROJECT}/cassandra:${VERSION} . docker build -t ${PROJECT}/cassandra:${VERSION} .
push: build push: build
gcloud docker push ${PROJECT}/cassandra:${VERSION} gcloud docker -- push ${PROJECT}/cassandra:${VERSION}
.PHONY: all build push .PHONY: all build push

2
federation/cluster/common.sh
View File

@ -333,7 +333,7 @@ function push-federation-images {
kube::log::status "Pushing ${docker_image_tag}" kube::log::status "Pushing ${docker_image_tag}"
if [[ "${FEDERATION_PUSH_REPO_BASE}" == "gcr.io/"* ]]; then if [[ "${FEDERATION_PUSH_REPO_BASE}" == "gcr.io/"* ]]; then
echo " -> GCR repository detected. Using gcloud" echo " -> GCR repository detected. Using gcloud"
gcloud docker push "${docker_image_tag}" gcloud docker -- push "${docker_image_tag}"
else else
docker push "${docker_image_tag}" docker push "${docker_image_tag}"
fi fi

2
federation/develop/develop.sh
View File

@ -127,7 +127,7 @@ function push() {
fi fi
kube::log::status "Pushing hyperkube image to the registry" kube::log::status "Pushing hyperkube image to the registry"
gcloud docker push "${KUBE_REGISTRY}/hyperkube-amd64:${kube_version}" gcloud docker -- push "${KUBE_REGISTRY}/hyperkube-amd64:${kube_version}"
# Update config after build and push, but before turning up the clusters # Update config after build and push, but before turning up the clusters
# to ensure the config has the right image version tags. # to ensure the config has the right image version tags.

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

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

2
test/images/dnsutils/Makefile
View File

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

2
test/images/fakegitserver/Makefile
View File

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

2
test/images/goproxy/Makefile
View File

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

2
test/images/hostexec/Makefile
View File

@ -24,7 +24,7 @@ image:
docker build -t $(PREFIX)/hostexec:$(TAG) . docker build -t $(PREFIX)/hostexec:$(TAG) .
push: image push: image
gcloud docker push $(PREFIX)/hostexec:$(TAG) gcloud docker -- push $(PREFIX)/hostexec:$(TAG)
clean: clean:
rm -f hostexec 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 docker tag $(PREFIX)/${IMAGE} $(PREFIX)/${IMAGE}:$(TAG) # Add the version tag to the latest image
push: image push: image
gcloud docker push $(PREFIX)/${IMAGE} # Push image tagged as latest to repository 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}:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
clean: clean:

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

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

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

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

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

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

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

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

2
test/images/netexec/Makefile
View File

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

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

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

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

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

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

@ -21,7 +21,7 @@ container:
docker build -t $(PREFIX):$(TAG) . docker build -t $(PREFIX):$(TAG) .
push: container push: container
gcloud docker push $(PREFIX):$(TAG) gcloud docker -- push $(PREFIX):$(TAG)
clean: clean:
docker rmi $(PREFIX):$(TAG) 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) . docker build -t $(PREFIX)/portforwardtester:$(TAG) .
push: image push: image
gcloud docker push $(PREFIX)/portforwardtester:$(TAG) gcloud docker -- push $(PREFIX)/portforwardtester:$(TAG)
clean: clean:
rm -f portforwardtester rm -f portforwardtester

2
test/images/porter/Makefile
View File

@ -41,7 +41,7 @@ image:
push: push:
$(if $(TAG),,$(error TAG is not defined. Use 'make tag' after committing changes to see a suggestion)) $(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: clean:
rm -f porter 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) docker run --publish=8080:8080 $(PREFIX)/resource_consumer:$(TAG)
push: push:
gcloud docker push ${PREFIX}/resource_consumer:${TAG} gcloud docker -- push ${PREFIX}/resource_consumer:${TAG}
gcloud docker push ${PREFIX}/resource_consumer/controller:${TAG} gcloud docker -- push ${PREFIX}/resource_consumer/controller:${TAG}
clean: clean:
rm -f consumer rm -f consumer

4
test/images/serve_hostname/Makefile
View File

@ -90,9 +90,9 @@ container: .container-$(ARCH)
push: .push-$(ARCH) push: .push-$(ARCH)
.push-$(ARCH): .container-$(ARCH) .push-$(ARCH): .container-$(ARCH)
gcloud docker push $(IMAGE):$(TAG) gcloud docker -- push $(IMAGE):$(TAG)
if [ -n "$(TEST_REGISTRY)" ]; then \ if [ -n "$(TEST_REGISTRY)" ]; then \
gcloud docker push $(TEST_IMAGE):$(TAG) ;\ gcloud docker -- push $(TEST_IMAGE):$(TAG) ;\
fi fi
clean: 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 docker tag $(PREFIX)/volume-ceph $(PREFIX)/volume-ceph:$(TAG) # Add the version tag to the latest image
push: image push: image
gcloud docker push $(PREFIX)/volume-ceph # Push image tagged as latest to repository 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:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
clean: clean:

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

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

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

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

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

@ -22,7 +22,7 @@ container: image
image: image:
# Build new image and automatically tag it as latest # Build new image and automatically tag it as latest
docker build -t $(PREFIX)/volume-rbd . 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) docker tag $(PREFIX)/volume-rbd $(PREFIX)/volume-rbd:$(TAG)
block: block:
@ -34,8 +34,8 @@ block:
push: image push: image
# Push image tagged as latest to repository # 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) # 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: clean: