From 45f6a9dd343ea04b2bdf6f220a273c9408743032 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Fri, 15 Apr 2016 06:45:44 +0000
Subject: [PATCH] Task #8437: Change docker tags to full name of branch, for
easier marshalling of branch ID between subsystems
---
Docker/docker-template | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/Docker/docker-template b/Docker/docker-template
index a5eed91ba54..7b3987abe45 100755
--- a/Docker/docker-template
+++ b/Docker/docker-template
@@ -55,16 +55,14 @@ export LOFAR_BRANCH_NAME=`echo "$VERSION_INFO" | perl -ne 'print "$1" if /branch
export LOFAR_BRANCH_URL="https://svn.astron.nl/LOFAR/${LOFAR_BRANCH_NAME}"
-# ----- LOFAR_TAG = 1234 -----
+# ----- LOFAR_TAG = LOFAR-Task1234 -----
# ----- LOFAR_TAG = trunk -----
-# ----- LOFAR_TAG = 2_15_1 -----
+# ----- LOFAR_TAG = LOFAR-Release-2_15_1 -----
case "${LOFAR_BRANCH_NAME}" in
trunk) export LOFAR_TAG=trunk ;;
- */LOFAR-Release-*)
- # support releases in both tags/ and branches/
- export LOFAR_TAG=${LOFAR_BRANCH_NAME##*/LOFAR-Release-} ;;
- branches/*) export LOFAR_TAG=${LOFAR_BRANCH_NAME##branches/*Task} ;;
+ branches/*) export LOFAR_TAG=${LOFAR_BRANCH_NAME##branches/} ;;
+ tags/*) export LOFAR_TAG=${LOFAR_BRANCH_NAME##tags/} ;;
*) export LOFAR_TAG=latest ;;
esac
--
GitLab