github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

gcloud docker now auths k8s.gcr.io by default

pull/6/head
Tim Hockin 2017-12-14 20:50:14 -08:00
parent eba5b6092a
commit f7be352a67
28 changed files with 39 additions and 39 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 --pull -t k8s.gcr.io/$(IMAGE):$(TAG) . docker build --pull -t k8s.gcr.io/$(IMAGE):$(TAG) .
push: build push: build
gcloud docker --server=k8s.gcr.io -- push k8s.gcr.io/$(IMAGE):$(TAG) gcloud docker -- push k8s.gcr.io/$(IMAGE):$(TAG)

2
build/debian-base/Makefile
View File

@ -71,7 +71,7 @@ endif
rm -rf $(TEMP_DIR) rm -rf $(TEMP_DIR)
push: build push: build
gcloud docker --server=k8s.gcr.io -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)
clean: clean:
docker rmi -f $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) || true docker rmi -f $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) || true

2
build/debian-hyperkube-base/Makefile
View File

@ -57,4 +57,4 @@ endif
rm -rf $(TEMP_DIR) rm -rf $(TEMP_DIR)
push: build push: build
gcloud docker --server=k8s.gcr.io -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)

2
build/debian-iptables/Makefile
View File

@ -55,6 +55,6 @@ endif
docker build --pull -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR) docker build --pull -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR)
push: build push: build
gcloud docker --server=k8s.gcr.io -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)
all: push all: push

4
build/pause/Makefile
View File

@ -87,13 +87,13 @@ endif
push: .push-$(ARCH) push: .push-$(ARCH)
.push-$(ARCH): .container-$(ARCH) .push-$(ARCH): .container-$(ARCH)
gcloud docker --server=k8s.gcr.io -- 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 --server=k8s.gcr.io -- push $(LEGACY_AMD64_IMAGE):$(TAG) gcloud docker -- push $(LEGACY_AMD64_IMAGE):$(TAG)
endif endif
touch $@ touch $@

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

@ -46,12 +46,12 @@ build:
docker build --pull -t $(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR) docker build --pull -t $(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR)
push: build push: build
gcloud docker --server=k8s.gcr.io -- 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 rmi $(IMAGE):$(VERSION) 2>/dev/null || true docker rmi $(IMAGE):$(VERSION) 2>/dev/null || true
docker tag $(IMAGE)-$(ARCH):$(VERSION) $(IMAGE):$(VERSION) docker tag $(IMAGE)-$(ARCH):$(VERSION) $(IMAGE):$(VERSION)
gcloud docker --server=k8s.gcr.io -- 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:
docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) . docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
push: push:
gcloud docker --server=k8s.gcr.io -- push $(PREFIX)/$(IMAGE):$(TAG) gcloud docker -- push $(PREFIX)/$(IMAGE):$(TAG)
binary: binary:
CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-w" elasticsearch_logging_discovery.go 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) . docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
push: 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)" . docker build --pull -t "$(IMAGE):$(VERSION)" .
push: 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) . docker build --pull -t $(REPO):$(TAG) .
push: 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} . docker build --pull -t ${REGISTRY}/${IMAGE}:${TAG} .
push: push:
gcloud docker --server=k8s.gcr.io -- push ${REGISTRY}/${IMAGE}:${TAG} gcloud docker -- push ${REGISTRY}/${IMAGE}:${TAG}
upload: upload:
./stage-upload.sh ${TAG} ${REGISTRY}/${IMAGE}:${TAG} ./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 rm -rf etcdctl etcd-v$(ETCD_VERSION)-linux-amd64 etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz
push: build 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) docker build -t $(IMAGE) $(TEMP_DIR)
push: build push: build
gcloud docker --server=k8s.gcr.io -- push $(IMAGE) gcloud docker -- push $(IMAGE)
all: build 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) docker build --pull -t $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(TEMP_DIR)
push: build 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) 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 --server=k8s.gcr.io -- 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

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

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

@ -22,6 +22,6 @@ image:
docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) . docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
push: image push: image
gcloud docker --server=k8s.gcr.io -- 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 --pull -t $(PREFIX)/$(IMAGE):$(TAG) . docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
push: image push: image
gcloud docker --server=k8s.gcr.io -- push $(PREFIX)/$(IMAGE) gcloud docker -- push $(PREFIX)/$(IMAGE)
clean: clean:

2
examples/explorer/Makefile
View File

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

2
examples/guestbook-go/Makefile
View File

@ -29,7 +29,7 @@ build:
# push the image to an registry # push the image to an registry
push: push:
gcloud docker --server=k8s.gcr.io -- push ${REGISTRY}/guestbook:${VERSION} gcloud docker -- push ${REGISTRY}/guestbook:${VERSION}
# remove previous images and containers # remove previous images and containers
clean: clean:

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 --server=k8s.gcr.io -- push k8s.gcr.io/kubectl:$(TAG) gcloud docker -- push k8s.gcr.io/kubectl:$(TAG)
clean: clean:
rm -f kubectl rm -f kubectl

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

@ -35,7 +35,7 @@ container-dev:
build: container container-dev build: container container-dev
push: build push: build
gcloud docker --server=k8s.gcr.io -- push ${PROJECT}/cassandra:${VERSION} gcloud docker -- push ${PROJECT}/cassandra:${VERSION}
gcloud docker --server=k8s.gcr.io -- push ${PROJECT}/cassandra:${VERSION}-dev gcloud docker -- push ${PROJECT}/cassandra:${VERSION}-dev
.PHONY: all build push .PHONY: all build push

4
test/e2e_node/conformance/build/Makefile
View File

@ -76,10 +76,10 @@ endif
docker build --pull -t ${IMAGE_NAME}-${ARCH}:${VERSION} ${TEMP_DIR} docker build --pull -t ${IMAGE_NAME}-${ARCH}:${VERSION} ${TEMP_DIR}
push: build push: build
gcloud docker --server=k8s.gcr.io -- push ${IMAGE_NAME}-${ARCH}:${VERSION} gcloud docker -- push ${IMAGE_NAME}-${ARCH}:${VERSION}
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
docker tag ${IMAGE_NAME}-${ARCH}:${VERSION} ${IMAGE_NAME}:${VERSION} docker tag ${IMAGE_NAME}-${ARCH}:${VERSION} ${IMAGE_NAME}:${VERSION}
gcloud docker --server=k8s.gcr.io -- push ${IMAGE_NAME}:${VERSION} gcloud docker -- push ${IMAGE_NAME}:${VERSION}
endif endif
.PHONY: all .PHONY: all

2
test/images/image-util.sh
View File

@ -97,7 +97,7 @@ push() {
fi fi
for arch in ${archs}; do for arch in ${archs}; do
TAG=$(<${IMAGE}/VERSION) TAG=$(<${IMAGE}/VERSION)
gcloud docker --server=k8s.gcr.io -- push ${REGISTRY}/${IMAGE}-${arch}:${TAG} gcloud docker -- push ${REGISTRY}/${IMAGE}-${arch}:${TAG}
done done
} }

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 --server=k8s.gcr.io -- 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 --server=k8s.gcr.io -- 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:

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

@ -24,7 +24,7 @@ image:
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 --server=k8s.gcr.io -- 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 --server=k8s.gcr.io -- 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 --server=k8s.gcr.io -- 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 --server=k8s.gcr.io -- 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 --server=k8s.gcr.io -- 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 --server=k8s.gcr.io -- 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:

4
test/images/volumes-tester/rbd/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 --server=k8s.gcr.io -- 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 --server=k8s.gcr.io -- push $(PREFIX)/volume-rbd:$(TAG) gcloud docker -- push $(PREFIX)/volume-rbd:$(TAG)
clean: clean: