diff --git a/.travis.yml b/.travis.yml index c4aa1601f..77ceb068a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/Makefile b/Makefile index aec42d47c..327060fef 100644 --- a/Makefile +++ b/Makefile @@ -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) > $@ diff --git a/hack/gcr-push.sh b/hack/gcr-push.sh index 252285288..da137e57e 100755 --- a/hack/gcr-push.sh +++ b/hack/gcr-push.sh @@ -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