github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-29 21:29:24 +00:00
Code Issues Projects Releases Wiki Activity

gcloud docker now auths k8s.gcr.io by default

Browse Source
This commit is contained in:
Tim Hockin
2017-12-14 20:50:14 -08:00
parent eba5b6092a
commit f7be352a67
28 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,12 +46,12 @@ build:
docker build --pull -t $(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR)
push: build
gcloud docker --server=k8s.gcr.io -- push $(IMAGE)-$(ARCH):$(VERSION)
gcloud docker -- push $(IMAGE)-$(ARCH):$(VERSION)
ifeq ($(ARCH),amd64)
# Backward compatibility. TODO: deprecate this image tag
docker rmi $(IMAGE):$(VERSION) 2>/dev/null || true
docker tag $(IMAGE)-$(ARCH):$(VERSION) $(IMAGE):$(VERSION)
gcloud docker --server=k8s.gcr.io -- 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:
docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
push:
gcloud docker --server=k8s.gcr.io -- push $(PREFIX)/$(IMAGE):$(TAG)
gcloud docker -- push $(PREFIX)/$(IMAGE):$(TAG)
binary:
CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-w" elasticsearch_logging_discovery.go

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

@@ -22,4 +22,4 @@ build:
docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
push:
gcloud docker --server=k8s.gcr.io -- push $(PREFIX)/$(IMAGE):$(TAG)
gcloud docker -- push $(PREFIX)/$(IMAGE):$(TAG)

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

@@ -21,5 +21,5 @@ build:
docker build --pull -t "$(IMAGE):$(VERSION)" .
push:
gcloud docker --server=k8s.gcr.io -- push "$(IMAGE):$(VERSION)"
gcloud docker -- push "$(IMAGE):$(VERSION)"

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

@@ -21,4 +21,4 @@ build:
docker build --pull -t $(REPO):$(TAG) .
push:
gcloud docker --server=k8s.gcr.io -- push $(REPO):$(TAG)
gcloud docker -- push $(REPO):$(TAG)

2
cluster/gce/gci/mounter/Makefile
View File

@@ -22,7 +22,7 @@ container:
docker build --pull -t ${REGISTRY}/${IMAGE}:${TAG} .
push:
gcloud docker --server=k8s.gcr.io -- push ${REGISTRY}/${IMAGE}:${TAG}
gcloud docker -- push ${REGISTRY}/${IMAGE}:${TAG}
upload:
./stage-upload.sh ${TAG} ${REGISTRY}/${IMAGE}:${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 --server=k8s.gcr.io -- push $(IMAGE):$(TAG)
gcloud docker -- push $(IMAGE):$(TAG)

2
cluster/images/etcd-version-monitor/Makefile
View File

@@ -40,7 +40,7 @@ build:
docker build -t $(IMAGE) $(TEMP_DIR)
push: build
gcloud docker --server=k8s.gcr.io -- push $(IMAGE)
gcloud docker -- push $(IMAGE)
all: build

4
cluster/images/etcd/Makefile
View File

@@ -105,12 +105,12 @@ endif
docker build --pull -t $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(TEMP_DIR)
push: build
gcloud docker --server=k8s.gcr.io -- 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 --server=k8s.gcr.io -- push $(REGISTRY)/etcd:$(REGISTRY_TAG)
gcloud docker -- push $(REGISTRY)/etcd:$(REGISTRY_TAG)
endif
all: build

4
cluster/images/hyperkube/Makefile
View File

@@ -44,11 +44,11 @@ endif
rm -rf "${TEMP_DIR}"
push: build
gcloud docker --server=k8s.gcr.io -- push ${REGISTRY}/hyperkube-${ARCH}:${VERSION}
gcloud docker -- push ${REGISTRY}/hyperkube-${ARCH}:${VERSION}
ifeq ($(ARCH),amd64)
docker rmi ${REGISTRY}/hyperkube:${VERSION} 2>/dev/null || true
docker tag ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${REGISTRY}/hyperkube:${VERSION}
gcloud docker --server=k8s.gcr.io -- push ${REGISTRY}/hyperkube:${VERSION}
gcloud docker -- push ${REGISTRY}/hyperkube:${VERSION}
endif
.PHONY: build push all