Skip to content

Commit

Permalink
s/gcloud docker -- push/docker push/g everywhere in test-infra
Browse files Browse the repository at this point in the history
  • Loading branch information
@krzyzacy
krzyzacy committed Feb 9, 2018
1 parent 699ea07 commit 0bb6433
Show file tree
Hide file tree
Showing 22 changed files with 35 additions and 35 deletions.
8 changes: 4 additions & 4 deletions boskos/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,25 @@ metrics:
server-image:
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o boskos k8s.io/test-infra/boskos/
docker build -t "gcr.io/k8s-testimages/boskos:$(TAG)" .
gcloud docker -- push "gcr.io/k8s-testimages/boskos:$(TAG)"
docker push "gcr.io/k8s-testimages/boskos:$(TAG)"
rm boskos

reaper-image:
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o reaper/reaper k8s.io/test-infra/boskos/reaper/
docker build -t "gcr.io/k8s-testimages/reaper:$(TAG)" reaper
gcloud docker -- push "gcr.io/k8s-testimages/reaper:$(TAG)"
docker push "gcr.io/k8s-testimages/reaper:$(TAG)"
rm reaper/reaper

janitor-image:
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o janitor/janitor k8s.io/test-infra/boskos/janitor/
docker build --no-cache -t "gcr.io/k8s-testimages/janitor:$(TAG)" janitor
gcloud docker -- push "gcr.io/k8s-testimages/janitor:$(TAG)"
docker push "gcr.io/k8s-testimages/janitor:$(TAG)"
rm janitor/janitor

metrics-image:
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o metrics/metrics k8s.io/test-infra/boskos/metrics/
docker build -t "gcr.io/k8s-testimages/metrics:$(TAG)" metrics
gcloud docker -- push "gcr.io/k8s-testimages/metrics:$(TAG)"
docker push "gcr.io/k8s-testimages/metrics:$(TAG)"
rm metrics/metrics

server-deployment:
Expand Down
2 changes: 1 addition & 1 deletion gcsweb/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ container-name:

push: .push-$(DOTFILE_IMAGE) push-name
.push-$(DOTFILE_IMAGE): .container-$(DOTFILE_IMAGE)
@gcloud docker -- push $(IMAGE):$(VERSION)
@docker push $(IMAGE):$(VERSION)
@docker images -q $(IMAGE):$(VERSION) > $@

push-name:
Expand Down
6 changes: 3 additions & 3 deletions images/bazelbuild/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ do_build = \
echo tagged $(IMG) with latest-latest tag;

do_push = \
gcloud docker -- push $(IMG):$(TAG)-$(VERSION);\
gcloud docker -- push $(IMG):latest-$(VERSION);\
docker push $(IMG):$(TAG)-$(VERSION);\
docker push $(IMG):latest-$(VERSION);\
echo Pushed $(IMG) with $(TAG)-$(VERSION) and latest-$(VERSION) tags;\
[ "$(VERSION)" == "$(LATEST_BAZEL_VERSION)" ] &&\
gcloud docker -- push $(IMG):latest-latest &&\
docker push $(IMG):latest-latest &&\
echo Pushed $(IMG) with latest-latest tag;

build:
Expand Down
2 changes: 1 addition & 1 deletion images/bigquery/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ image:
docker build -t "gcr.io/k8s-testimages/bigquery:$(VERSION)" .

push: image
gcloud docker -- push "gcr.io/k8s-testimages/bigquery:$(VERSION)"
docker push "gcr.io/k8s-testimages/bigquery:$(VERSION)"

.PHONY: image push
4 changes: 2 additions & 2 deletions images/bootstrap/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ build:
@echo Built $(IMG):$(TAG) and tagged with latest

push: build
gcloud docker -- push $(IMG):$(TAG)
gcloud docker -- push $(IMG):latest
docker push $(IMG):$(TAG)
docker push $(IMG):latest
@echo Pushed $(IMG) with :latest and :$(TAG) tags
2 changes: 1 addition & 1 deletion images/gcloud/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ image:
docker build --build-arg "IMAGE_ARG=$(IMG):$(VERSION)" -t "$(IMG):$(VERSION)" .

push: image
gcloud docker -- push "$(IMG):$(VERSION)"
docker push "$(IMG):$(VERSION)"

.PHONY: image push
2 changes: 1 addition & 1 deletion images/heapster/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ image:
docker build -t "gcr.io/k8s-testimages/heapster-test:$(VERSION)" .

push:
gcloud docker -- push "gcr.io/k8s-testimages/heapster-test:$(VERSION)"
docker push "gcr.io/k8s-testimages/heapster-test:$(VERSION)"

.PHONY: image push
2 changes: 1 addition & 1 deletion images/kubeadm/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ image:
docker build --no-cache -t "$(IMG):$(VERSION)" --build-arg "IMAGE_ARG=$(IMG):$(VERSION)" .

push: image
gcloud docker -- push "$(IMG):$(VERSION)"
docker push "$(IMG):$(VERSION)"

.PHONY: image push
4 changes: 2 additions & 2 deletions images/kubekins-e2e/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ build: kubetest
@echo Built $(IMG):$(TAG)-$(K8S) and tagged with latest-$(K8S)

push: build
gcloud docker -- push $(IMG):$(TAG)-$(K8S)
gcloud docker -- push $(IMG):latest-$(K8S)
docker push $(IMG):$(TAG)-$(K8S)
docker push $(IMG):latest-$(K8S)
@echo Pushed $(IMG) with :latest-$(K8S) and :$(TAG)-$(K8S) tags

.PHONY: all kubetest build push help
Expand Down
4 changes: 2 additions & 2 deletions images/kubekins-test/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ do_build = \

do_push = \
$(eval VERSION := $(subst ./Dockerfile-,,$(v)))\
gcloud docker -- push $(IMG):$(VERSION)-$(TAG);\
gcloud docker -- push $(IMG):$(VERSION)-latest;\
docker push $(IMG):$(VERSION)-$(TAG);\
docker push $(IMG):$(VERSION)-latest;\
echo Pushed $(IMG):$(VERSION)-latest and $(IMG):$(VERSION)-$(TAG);

.PHONY: all build push help
Expand Down
2 changes: 1 addition & 1 deletion images/pull-test-infra-gubernator/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ image:
docker build -t "gcr.io/k8s-testimages/gubernator:$(VERSION)" .

push: image
gcloud docker -- push "gcr.io/k8s-testimages/gubernator:$(VERSION)"
docker push "gcr.io/k8s-testimages/gubernator:$(VERSION)"

.PHONY: image push
4 changes: 2 additions & 2 deletions kettle/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ build:
echo Built $(IMG):$(TAG) and tagged with $(IMG):latest ;

push: build
gcloud docker -- push $(IMG):$(TAG)
gcloud docker -- push $(IMG):latest
docker push $(IMG):$(TAG)
docker push $(IMG):latest
echo Pushed $(IMG):latest and $(IMG):$(TAG)

deploy: get-cluster-credentials
Expand Down
4 changes: 2 additions & 2 deletions logexporter/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ build: cmd/logexporter
@echo Built $(IMG):$(TAG) and tagged with latest

push: build
gcloud docker -- push $(IMG):$(TAG)
gcloud docker -- push $(IMG):latest
docker push $(IMG):$(TAG)
docker push $(IMG):latest
@echo Pushed $(IMG) with :latest and :$(TAG) tags
4 changes: 2 additions & 2 deletions maintenance/aws-janitor/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ image:

push: image
docker tag "$(IMAGE):$(VERSION)" "$(IMAGE):latest"
gcloud docker -- push "$(IMAGE):$(VERSION)"
gcloud docker -- push "$(IMAGE):latest"
docker push "$(IMAGE):$(VERSION)"
docker push "$(IMAGE):latest"

.PHONY: image push
2 changes: 1 addition & 1 deletion mungegithub/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ container: mungegithub
# push the container
push: container
ifneq (,$(findstring gcr.io,$(REPO)))
gcloud docker -- push $(CONTAINER)
docker push $(CONTAINER)
else
docker push $(CONTAINER)
endif
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/issue_labeler/deploy.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ EOF

IMAGE=${1:-gcr.io/k8s-testimages/issue-triager:latest}
docker build --pull -t "$IMAGE" -f Dockerfile .
gcloud docker -- push "$IMAGE"
docker push "$IMAGE"

kubectl apply -f - <<EOF
apiVersion: extensions/v1beta1
Expand Down
2 changes: 1 addition & 1 deletion planter/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ image:
docker build --build-arg BAZEL_VERSION=$(BAZEL_VERSION) -t "$(IMAGE_NAME):$(TAG)" . --pull

push: image
gcloud docker -- push "$(IMAGE_NAME):$(TAG)"
docker push "$(IMAGE_NAME):$(TAG)"

.PHONY: image push
4 changes: 2 additions & 2 deletions queue_health/common.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ build:
@echo Built $(IMG):$(TAG) and tagged with latest

push: build
gcloud docker -- push $(IMG):$(TAG)
gcloud docker -- push $(IMG):latest
docker push $(IMG):$(TAG)
docker push $(IMG):latest
@echo Pushed $(IMG) with :latest and :$(TAG) tags

4 changes: 2 additions & 2 deletions triage/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ build:
echo Built $(IMG):$(TAG) and tagged with $(IMG):latest ;

push:
gcloud docker -- push $(IMG):$(TAG)
gcloud docker -- push $(IMG):latest
docker push $(IMG):$(TAG)
docker push $(IMG):latest
echo Pushed $(IMG):latest and $(IMG):$(TAG)

push_static:
Expand Down
2 changes: 1 addition & 1 deletion velodrome/fetcher/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ build:
@echo Built $(IMG):$(TAG)

push: build
gcloud docker -- push $(IMG):$(TAG)
docker push $(IMG):$(TAG)
@echo Pushed $(IMG):$(TAG)
2 changes: 1 addition & 1 deletion velodrome/token-counter/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ build:
@echo Built $(IMG):$(TAG)

push: build
gcloud docker -- push $(IMG):$(TAG)
docker push $(IMG):$(TAG)
@echo Pushed $(IMG):$(TAG)
2 changes: 1 addition & 1 deletion velodrome/transform/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ build:
@echo Built $(IMG):$(TAG)

push: build
gcloud docker -- push $(IMG):$(TAG)
docker push $(IMG):$(TAG)
@echo Pushed $(IMG):$(TAG)

0 comments on commit 0bb6433

Please sign in to comment.