fix conflict

pull/8810/head
Marcin Niemira 2020-08-13 09:42:19 +10:00
parent 75dd0cf591
commit ac2988c8aa
No known key found for this signature in database
GPG Key ID: 053E25BDC33ED6A3
1 changed files with 0 additions and 4 deletions

View File

@ -576,10 +576,6 @@ endif
.PHONY: push-kic-base-image-gcr
push-kic-base-image-gcr: kic-base-image ## Push kic-base to gcr
docker login gcr.io/k8s-minikube
(docker pull $(IMAGE) && (echo "Image already exist"; exit 1) || echo "Image doesn't exist in registry")
ifndef AUTOPUSH
$(call user_confirm, 'Are you sure you want to push $(IMAGE) ?')
endif
$(MAKE) push-docker IMAGE=$(KIC_BASE_IMAGE_GCR)
.PHONY: push-kic-base-image-gh