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

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

@@ -63,11 +63,11 @@ endif
docker build -t $(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR)
push: build
gcloud docker push $(IMAGE)-$(ARCH):$(VERSION)
gcloud docker -- push $(IMAGE)-$(ARCH):$(VERSION)
ifeq ($(ARCH),amd64)
# Backward compatibility. TODO: deprecate this image tag
docker tag -f $(IMAGE)-$(ARCH):$(VERSION) $(IMAGE):$(VERSION)
gcloud docker push $(IMAGE):$(VERSION)
gcloud docker -- push $(IMAGE):$(VERSION)
endif
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) .
push:
gcloud docker push gcr.io/google_containers/elasticsearch:$(TAG)
gcloud docker -- push gcr.io/google_containers/elasticsearch:$(TAG)
elasticsearch_logging_discovery:
go build elasticsearch_logging_discovery.go

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

@@ -17,8 +17,8 @@
IMAGE = fluentd-elasticsearch
TAG = 1.19
build:
build:
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
push:
gcloud docker --server=gcr.io push gcr.io/google_containers/$(IMAGE):$(TAG)
push:
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) .
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.
# 5. Issue PR.
# 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
@@ -47,4 +47,4 @@ build:
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)" .
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) .
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
push: build
gcloud docker push $(IMAGE):$(TAG)
gcloud docker -- push $(IMAGE):$(TAG)

6
cluster/images/etcd/Makefile
View File

@@ -68,7 +68,7 @@ ifeq ($(ARCH),amd64)
cp $(TEMP_DIR)/etcdctl $(TEMP_DIR)/etcdctl-$$tag; \
done
else
# 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 tag in $(TAGS); do \
@@ -98,12 +98,12 @@ endif
docker build -t $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(TEMP_DIR)
push: build
gcloud docker push $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG)
gcloud docker -- push $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG)
ifeq ($(ARCH),amd64)
# Backward compatibility. TODO: deprecate this image 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
all: build

4
cluster/images/hyperkube/Makefile
View File

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

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

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

2
cluster/images/kubemark/Makefile
View File

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