From 044df99b782facfab131b61c482f01dbb83410ca Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 17 Jun 2019 20:44:51 +0200 Subject: [PATCH] Separate Push for release and dev --- .circleci/config.yml | 1 + Makefile | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 34cf8c6f..e4cbf242 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -50,6 +50,7 @@ jobs: command: | docker login -u $docker_release_user -p $docker_release_password make release + make push-release workflows: version: 2 diff --git a/Makefile b/Makefile index bde2e89d..29e4ec15 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ build: --build-arg BUILD_DATE=$(BUILD_DATE) \ --build-arg VCS_URL=$(VCS_URL) -push: +push-dev: docker push $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG) pull: @@ -25,6 +25,7 @@ release: docker tag $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG) $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):$(DOCKER_RELEASE_TAG) docker tag $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG) $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):latest +push-release: docker push $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):$(DOCKER_RELEASE_TAG) docker push $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):latest