From c515adf6936bc4adcd10d220cdce98e3342c9d06 Mon Sep 17 00:00:00 2001 From: "Alexey.Golubev" Date: Wed, 27 Jul 2016 16:13:52 +0300 Subject: [PATCH] Remade setup a docker version --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7ebb05c..4d19f2f 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ PACKAGE_VERSION := $(PRODUCT_VERSION)-$(BUILD_NUMBER) ifeq ($(GIT_BRANCH), origin/develop) -DOCKER_TAGS += $(PACKAGE_VERSION) +DOCKER_TAGS += $(subst -,.,$(PACKAGE_VERSION)) DOCKER_TAGS += latest else -DOCKER_TAGS += $(PACKAGE_VERSION)-$(subst /,-,$(GIT_BRANCH)) +DOCKER_TAGS += $(subst -,.,$(PACKAGE_VERSION))-$(subst /,-,$(GIT_BRANCH)) endif DOCKER_REPO = $(COMPANY_NAME)/4testing-$(PRODUCT_NAME) @@ -18,7 +18,7 @@ $(DOCKER_TARGETS): $(DEB_REPO_DATA) sed "s|{{GIT_BRANCH}}|$(GIT_BRANCH)|" -i Dockerfile sed 's/{{PACKAGE_VERSION}}/'$(PACKAGE_VERSION)'/' -i Dockerfile - sudo docker build -t $(subst -,.,$(subst $(COLON),:,$@)) . &&\ + sudo docker build -t $(subst $(COLON),:,$@) . &&\ mkdir -p $$(dirname $@) &&\ echo "Done" > $@ @@ -31,4 +31,4 @@ clean-docker: sudo docker rmi -f $$(sudo docker images -q $(COMPANY_NAME)/*) || exit 0 deploy: $(DOCKER_TARGETS) - $(foreach TARGET,$(DOCKER_TARGETS),sudo docker push $(subst -,.,$(subst $(COLON),:,$(TARGET)));) + $(foreach TARGET,$(DOCKER_TARGETS),sudo docker push $(subst $(COLON),:,$(TARGET));)