diff --git a/Makefile b/Makefile index 021bbac..eee3564 100644 --- a/Makefile +++ b/Makefile @@ -244,7 +244,7 @@ docker-tag: docker-tag-ci: docker tag cointop/cointop:latest cointop/cointop:$(CIRCLE_SHA1) docker tag cointop/cointop:latest cointop/cointop:$(CIRCLE_BRANCH) - test $(COMMIT_TAG) && docker tag cointop/cointop:latest cointop/cointop:$(COMMIT_TAG) && true + test $(COMMIT_TAG) && docker tag cointop/cointop:latest cointop/cointop:$(COMMIT_TAG); true docker-run: docker run -it cointop/cointop @@ -256,7 +256,7 @@ docker-push: docker-push-ci: docker push cointop/cointop:$(CIRCLE_SHA1) docker push cointop/cointop:$(CIRCLE_BRANCH) - test $(COMMIT_TAG) && docker push cointop/cointop:$(COMMIT_TAG) && true + test $(COMMIT_TAG) && docker push cointop/cointop:$(COMMIT_TAG); true test $(CIRCLE_BRANCH) == "master" && docker push cointop/cointop:latest; true docker-build-and-push: docker-build docker-tag docker-push