From 421b24c01c9ea3edce087d8e4f0bd794aa3fcfd0 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Wed, 27 Jul 2016 15:24:47 +0300 Subject: [PATCH] Fixed build crash --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b49df18..7ebb05c 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PACKAGE_VERSION := $(PRODUCT_VERSION).$(BUILD_NUMBER) +PACKAGE_VERSION := $(PRODUCT_VERSION)-$(BUILD_NUMBER) ifeq ($(GIT_BRANCH), origin/develop) DOCKER_TAGS += $(PACKAGE_VERSION) @@ -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 $(COLON),:,$@) . &&\ + sudo docker build -t $(subst -,.,$(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 $(COLON),:,$(TARGET));) + $(foreach TARGET,$(DOCKER_TARGETS),sudo docker push $(subst -,.,$(subst $(COLON),:,$(TARGET)));)