From 5c1b4cbe80e3e97cc9d65b51abf3be921d70d44a Mon Sep 17 00:00:00 2001
From: Sven Speckmaier <sps@ipunkt.biz>
Date: Fri, 29 Jun 2018 22:03:47 +0200
Subject: [PATCH] Build update: actually require dev-branch or tag being built

---
 Dockerfile           | 5 +++++
 docker/composer.json | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 569abf7..8c46387 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,8 +41,13 @@ WORKDIR /opt/rancherize
 
 # install composer packages
 RUN cd /opt/rancherize-package \
+	&& CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD) \
+	&& if [ "${CURRENT_BRANCH}" = "HEAD" ] ; then CURRENT_TAG=$(git describe --tags) ; fi \
+	&& TARGET_VERSION="dev-${CURRENT_BRANCH} as 2.99.9" \
+	&& if [ ! -z "${CURRENT_TAG}" ] ; then TARGET_VERSION=$(git describe --tags) ; fi \
 	&& (git fetch --unshallow origin || echo "Not a shallow repository, continuing without fetch") \
 	&& cd /opt/rancherize \
+	&& sed -i "s/%TARGET_VERSION%/${TARGET_VERSION}/" composer.json  \
 	&& curl -sSL "https://gist.githubusercontent.com/justb81/1006b89e41e41e1c848fe91969af7a0b/raw/c12faf968e659356ec1cb53f313e7f8383836be3/getcomposer.sh" | sh \
     && COMPOSER_ALLOW_SUPERUSER=1 ./composer.phar  install \
     && rm composer.phar
diff --git a/docker/composer.json b/docker/composer.json
index 95d7d11..3900303 100644
--- a/docker/composer.json
+++ b/docker/composer.json
@@ -6,7 +6,7 @@
     }
   ],
   "require": {
-    "ipunkt/rancherize": "dev-master as 2.99.9",
+    "ipunkt/rancherize": "%TARGET_VERSION%",
     "ipunkt/rancherize-backup-storagebox": "^1.0.1",
     "ipunkt/rancherize-ecr": "^1.0.0",
     "ipunkt/rancherize-publish-traefik-rancher": "^1.0.1",