Skip to content

Commit

Permalink
s/gcloud preview docker/gcloud docker/
Browse files Browse the repository at this point in the history
  • Loading branch information
@tallclair
tallclair committed Jun 18, 2015
1 parent 798739f commit f5830ed
Show file tree
Hide file tree
Showing 27 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion build/pause/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ build:
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .

push: build
gcloud preview docker push gcr.io/google_containers/$(IMAGE):$(TAG)
gcloud docker push gcr.io/google_containers/$(IMAGE):$(TAG)

all: push
2 changes: 1 addition & 1 deletion cluster/addons/dns/kube2sky/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ container: kube2sky
docker build -t $(PREFIX)/kube2sky:$(TAG) .

push:
gcloud preview docker push $(PREFIX)/kube2sky:$(TAG)
gcloud docker push $(PREFIX)/kube2sky:$(TAG)

clean:
rm -f kube2sky
Expand Down
2 changes: 1 addition & 1 deletion cluster/addons/dns/skydns/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ container: skydns
sudo docker build -t gcr.io/google_containers/skydns .

push:
sudo gcloud preview docker push gcr.io/google_containers/skydns
sudo gcloud docker push gcr.io/google_containers/skydns

clean:
rm -f skydns
2 changes: 1 addition & 1 deletion cluster/addons/fluentd-elasticsearch/es-image/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ build: elasticsearch_logging_discovery
docker build -t gcr.io/google_containers/elasticsearch:$(TAG) .

push:
gcloud preview 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
Expand Down
2 changes: 1 addition & 1 deletion cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ build:
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .

push:
gcloud preview docker push gcr.io/google_containers/$(IMAGE):$(TAG)
gcloud docker push gcr.io/google_containers/$(IMAGE):$(TAG)
2 changes: 1 addition & 1 deletion cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ build:
docker build -t gcr.io/google_containers/kibana:$(TAG) .

push:
gcloud preview docker push gcr.io/google_containers/kibana:$(TAG)
gcloud docker push gcr.io/google_containers/kibana:$(TAG)
2 changes: 1 addition & 1 deletion cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ build:


push:
gcloud preview docker push gcr.io/google_containers/fluentd-gcp:$(TAG)
gcloud docker push gcr.io/google_containers/fluentd-gcp:$(TAG)
2 changes: 1 addition & 1 deletion cluster/images/etcd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ build: clean
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .

push: build
gcloud preview docker push gcr.io/google_containers/$(IMAGE):$(TAG)
gcloud docker push gcr.io/google_containers/$(IMAGE):$(TAG)

all: push
2 changes: 1 addition & 1 deletion cluster/images/hyperkube/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ all:
curl -O https://storage.googleapis.com/kubernetes-release/release/${VERSION}/bin/linux/amd64/hyperkube
sed -i "s/VERSION/${VERSION}/g" master-multi.json master.json
docker build -t gcr.io/google_containers/hyperkube:${VERSION} .
gcloud preview docker push gcr.io/google_containers/hyperkube:${VERSION}
gcloud docker push gcr.io/google_containers/hyperkube:${VERSION}

.PHONY: all
2 changes: 1 addition & 1 deletion cluster/images/kubelet/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ LOCAL_OUTPUT_DIR=../../../_output/local
release: clean
curl -O https://storage.googleapis.com/kubernetes-release/release/${VERSION}/${BIN_DIR}/kubelet
docker build -t gcr.io/google_containers/kubelet:${VERSION} .
gcloud preview docker push gcr.io/google_containers/kubelet:${VERSION}
gcloud docker push gcr.io/google_containers/kubelet:${VERSION}

local: clean
cp ${LOCAL_OUTPUT_DIR}/${BIN_DIR}/kubelet .
Expand Down
2 changes: 1 addition & 1 deletion cluster/images/nginx/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ VERSION=v2

all:
docker build -t gcr.io/google_containers/nginx:${VERSION} .
gcloud preview docker push gcr.io/google_containers/nginx:${VERSION}
gcloud docker push gcr.io/google_containers/nginx:${VERSION}

.PHONY: all

4 changes: 2 additions & 2 deletions contrib/for-demos/serve_hostname/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ container: serve_hostname
sudo docker tag gcr.io/google_containers/serve_hostname:$(TAG) gcr.io/_b_k8s_authenticated_test/serve_hostname:$(TAG)

push:
gcloud preview docker push gcr.io/google_containers/serve_hostname:$(TAG)
gcloud preview docker push gcr.io/_b_k8s_authenticated_test/serve_hostname:$(TAG)
gcloud docker push gcr.io/google_containers/serve_hostname:$(TAG)
gcloud docker push gcr.io/_b_k8s_authenticated_test/serve_hostname:$(TAG)

clean:
rm -f serve_hostname
2 changes: 1 addition & 1 deletion contrib/for-demos/test-webserver/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ container: test-webserver
sudo docker build -t gcr.io/google_containers/test-webserver .

push: container
gcloud preview docker push gcr.io/google_containers/test-webserver
gcloud docker push gcr.io/google_containers/test-webserver

clean:
rm -f test-webserver
2 changes: 1 addition & 1 deletion contrib/for-tests/dnsutils/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ image:
docker build -t gcr.io/google_containers/dnsutils .

push:
gcloud preview docker push gcr.io/google_containers/dnsutils
gcloud docker push gcr.io/google_containers/dnsutils
2 changes: 1 addition & 1 deletion contrib/for-tests/mount-tester/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ image: mt
sudo docker build -t gcr.io/google_containers/mounttest:$(TAG) .

push: image
gcloud preview docker push gcr.io/google_containers/mounttest:$(TAG)
gcloud docker push gcr.io/google_containers/mounttest:$(TAG)

clean:
rm -f mt
2 changes: 1 addition & 1 deletion contrib/for-tests/network-tester/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ container: webserver
docker build -t gcr.io/google_containers/nettest:$(TAG) .

push: container
gcloud preview docker push gcr.io/google_containers/nettest:$(TAG)
gcloud docker push gcr.io/google_containers/nettest:$(TAG)

clean:
rm -f webserver
2 changes: 1 addition & 1 deletion contrib/for-tests/porter/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ container:

push:
$(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion))
gcloud preview docker push $(REPO)/porter:$(TAG)
gcloud docker push $(REPO)/porter:$(TAG)

clean:
rm -f porter
Expand Down
4 changes: 2 additions & 2 deletions contrib/for-tests/volumes-tester/gluster/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ container:
docker tag gcr.io/google_containers/volume-gluster gcr.io/google_containers/volume-gluster:$(TAG) # Add the version tag to the latest image

push: container
gcloud preview docker push gcr.io/google_containers/volume-gluster # Push image tagged as latest to repository
gcloud preview docker push gcr.io/google_containers/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 gcr.io/google_containers/volume-gluster # Push image tagged as latest to repository
gcloud docker push gcr.io/google_containers/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 changes: 2 additions & 2 deletions contrib/for-tests/volumes-tester/nfs/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ container:
docker tag gcr.io/google_containers/volume-nfs gcr.io/google_containers/volume-nfs:$(TAG) # Add the version tag to the latest image

push: container
gcloud preview docker push gcr.io/google_containers/volume-nfs # Push image tagged as latest to repository
gcloud preview docker push gcr.io/google_containers/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 gcr.io/google_containers/volume-nfs # Push image tagged as latest to repository
gcloud docker push gcr.io/google_containers/volume-nfs:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)

clean:
2 changes: 1 addition & 1 deletion contrib/logging/fluentd-sidecar-es/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ build:
docker build -t gcr.io/google_containers/fluentd-sidecar-es:$(TAG) .

push:
gcloud preview docker push gcr.io/google_containers/fluentd-sidecar-es:$(TAG)
gcloud docker push gcr.io/google_containers/fluentd-sidecar-es:$(TAG)
2 changes: 1 addition & 1 deletion contrib/logging/fluentd-sidecar-gcp/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ build:
docker build -t gcr.io/google_containers/fluentd-sidecar-gcp:$(TAG) .

push:
gcloud preview docker push gcr.io/google_containers/fluentd-sidecar-gcp:$(TAG)
gcloud docker push gcr.io/google_containers/fluentd-sidecar-gcp:$(TAG)
2 changes: 1 addition & 1 deletion contrib/pod-master/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ container: podmaster
docker build -t gcr.io/google_containers/podmaster:$(TAG) .

push: container
gcloud preview docker push gcr.io/google_containers/podmaster:$(TAG)
gcloud docker push gcr.io/google_containers/podmaster:$(TAG)

clean:
rm -f podmaster
2 changes: 1 addition & 1 deletion examples/environment-guide/containers/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ backend container.
GCR
---
docker build -t gcr.io/<project-name>/show .
gcloud preview docker push gcr.io/<project-name>/show
gcloud docker push gcr.io/<project-name>/show

Docker Hub
----------
Expand Down
2 changes: 1 addition & 1 deletion examples/explorer/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ container: explorer
docker build -t gcr.io/google_containers/explorer:$(TAG) .

push: container
gcloud preview docker push gcr.io/google_containers/explorer:$(TAG)
gcloud docker push gcr.io/google_containers/explorer:$(TAG)

clean:
rm -f explorer
2 changes: 1 addition & 1 deletion examples/kubectl-container/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ container:

push: container
$(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion))
gcloud preview docker push gcr.io/google_containers/kubectl:$(TAG)
gcloud docker push gcr.io/google_containers/kubectl:$(TAG)

clean:
rm -f kubectl
Expand Down
2 changes: 1 addition & 1 deletion examples/liveness/image/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ container: server
docker build -t gcr.io/google_containers/liveness .

push: container
gcloud preview docker push gcr.io/google_containers/liveness
gcloud docker push gcr.io/google_containers/liveness

clean:
rm -f server
2 changes: 1 addition & 1 deletion examples/meteor/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ your app image with your project ID, and push to GCR. Replace
`<project>` with your project ID.
```
docker tag my-meteor gcr.io/<project>/my-meteor
gcloud preview docker push gcr.io/<project>/my-meteor
gcloud docker push gcr.io/<project>/my-meteor
```

Running
Expand Down

0 comments on commit f5830ed

Please sign in to comment.