From 468420cfcda96544159b79f4b56df3e66f28a748 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Mon, 3 Apr 2017 14:34:21 +0300 Subject: [PATCH 1/2] Update 'latest' tag only for develop build --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f8fd661..6a95be7 100644 --- a/Makefile +++ b/Makefile @@ -9,11 +9,11 @@ UPDATE_LATEST := true endif ifneq (,$(findstring release,$(GIT_BRANCH))) -UPDATE_LATEST := true +UPDATE_LATEST := false endif ifneq (,$(findstring hotfix,$(GIT_BRANCH))) -UPDATE_LATEST := true +UPDATE_LATEST := false endif ifeq ($(UPDATE_LATEST), true) From 84bbcd78b7300dc39cfdb28c2694a0e53a278a33 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Tue, 4 Apr 2017 11:06:22 +0300 Subject: [PATCH 2/2] Fixed tag for release and hotfix --- Makefile | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 6a95be7..7a51308 100644 --- a/Makefile +++ b/Makefile @@ -5,20 +5,12 @@ REPO_URL := "deb http://repo-doc-onlyoffice-com.s3.amazonaws.com/ubuntu/trusty/$ UPDATE_LATEST := false ifneq (,$(findstring develop,$(GIT_BRANCH))) -UPDATE_LATEST := true -endif - -ifneq (,$(findstring release,$(GIT_BRANCH))) -UPDATE_LATEST := false -endif - -ifneq (,$(findstring hotfix,$(GIT_BRANCH))) -UPDATE_LATEST := false -endif - -ifeq ($(UPDATE_LATEST), true) DOCKER_TAGS += $(subst -,.,$(PACKAGE_VERSION)) DOCKER_TAGS += latest +else ifneq (,$(findstring release,$(GIT_BRANCH))) +DOCKER_TAGS += $(subst -,.,$(PACKAGE_VERSION)) +else ifneq (,$(findstring hotfix,$(GIT_BRANCH))) +DOCKER_TAGS += $(subst -,.,$(PACKAGE_VERSION)) else DOCKER_TAGS += $(subst -,.,$(PACKAGE_VERSION))-$(subst /,-,$(GIT_BRANCH)) endif