From 7802bd8885f4fe2ba05b88dd8d082e90ea1a3ab5 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Thu, 4 Feb 2016 11:05:19 +0000
Subject: [PATCH] Task #9048: Force revision back into image even for trunk,
otherwise the image will never be rebuilt as the Dockerfile does not change
between revisions
---
Docker/template.in | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/Docker/template.in b/Docker/template.in
index 3291f677490..6fc14eebeb3 100755
--- a/Docker/template.in
+++ b/Docker/template.in
@@ -45,15 +45,7 @@ export BRANCH_URL="$URL"
# ----- REVISION = 12345 -----
-if [ "{$BRANCH}" == "trunk" ]; then
- # Friendly special case to be able to export the output to 3rd parties.
- # They'll want the HEAD instead of the revision we happened to build with,
- # and we'll don't care that much for the race condition it causes for us
- # (between generating the output and using it)
- export REVISION=HEAD
-else
- export REVISION=`echo "$SVN_INFO" | perl -ne 'print "$1" if /Revision: +(.+)/;'`
-fi
+export REVISION=`echo "$SVN_INFO" | perl -ne 'print "$1" if /Revision: +(.+)/;'`
# ----- NOW = 2016-01-01 10:11:12 -----
--
GitLab