From 1781d565303f9258897b9e07cb52a8a733f28161 Mon Sep 17 00:00:00 2001 From: Felix Bartels Date: Tue, 6 Nov 2018 13:38:08 +0100 Subject: [PATCH] fix version tagging for core master and final Signed-off-by: Felix Bartels --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9d764d8..a5eadad 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ docker_pwd := `cat ~/.docker-account-pwd` base_version = $(shell docker run --rm $(docker_repo)/kopano_base cat /kopano/buildversion) base_download_version = $(shell ./version.sh core) -core_version = $(shell docker run --rm $(docker_repo)/kopano_core cat /kopano/buildversion | grep -o -P '(?<=-).*(?=_)') +core_version = $(shell docker run --rm $(docker_repo)/kopano_core cat /kopano/buildversion | grep -o -P '(?<=-).*(?=\+)') core_download_version = $(shell ./version.sh core) webapp_version = $(shell docker run --rm $(docker_repo)/kopano_webapp cat /kopano/buildversion | tail -n 1 | grep -o -P '(?<=-).*(?=\+)') webapp_download_version = $(shell ./version.sh webapp) @@ -25,6 +25,7 @@ build-all: build-ssl build-base build-core build-webapp build: component ?= base build: docker build \ + --build-arg KOPANO_CORE_VERSION=${core_download_version} \ --build-arg KOPANO_$(COMPONENT)_VERSION=${$(component)_download_version} \ --build-arg KOPANO_CORE_REPOSITORY_URL=$(KOPANO_CORE_REPOSITORY_URL) \ --build-arg KOPANO_WEBAPP_REPOSITORY_URL=$(KOPANO_WEBAPP_REPOSITORY_URL) \