Use gcloud docker, no helpers

Signed-off-by: Nolan Brubaker <brubakern@vmware.com>
This commit is contained in:
Nolan Brubaker
2019-09-03 18:02:52 -04:00
parent 878247fb36
commit 4aeead626b
3 changed files with 6 additions and 10 deletions
-1
View File
@@ -17,7 +17,6 @@ script:
before_deploy:
- if [ ! -d ${HOME}/google-cloud-sdk ]; then curl https://sdk.cloud.google.com | bash
/dev/stdin --disable-prompts; fi
- gcloud components install docker-credential-gcr
deploy:
- provider: script
+6 -6
View File
@@ -140,10 +140,10 @@ build-fsfreeze:
push-fsfreeze: BIN = fsfreeze-pause
push-fsfreeze:
@docker push $(IMAGE):$(VERSION)
@gcloud docker push $(IMAGE):$(VERSION)
ifeq ($(TAG_LATEST), true)
docker tag $(IMAGE):$(VERSION) $(IMAGE):latest
docker push $(IMAGE):latest
gcloud docker tag $(IMAGE):$(VERSION) $(IMAGE):latest
gcloud docker push $(IMAGE):latest
endif
@docker images -q $(REGISTRY)/fsfreeze-pause:$(VERSION) > .container-$(DOTFILE_IMAGE)
@@ -169,10 +169,10 @@ all-push:
push: .push-$(DOTFILE_IMAGE) push-name
.push-$(DOTFILE_IMAGE): .container-$(DOTFILE_IMAGE)
@docker push $(IMAGE):$(VERSION)
@gcloud docker push $(IMAGE):$(VERSION)
ifeq ($(TAG_LATEST), true)
docker tag $(IMAGE):$(VERSION) $(IMAGE):latest
docker push $(IMAGE):latest
gcloud docker tag $(IMAGE):$(VERSION) $(IMAGE):latest
gcloud docker push $(IMAGE):latest
endif
@docker images -q $(IMAGE):$(VERSION) > $@
-3
View File
@@ -56,9 +56,6 @@ touch /home/travis/.docker/config.json
# There's a prompt when trying to do this
#echo "Y" | gcloud beta auth configure-docker
# Use the standalone credential helper because the docker on Travis is older.
docker-credential-gcr configure-docker
echo "DIAGNOSTICS"
ls -al .
ls -al /home/travis/.docker