Trying fixed strong for branches.

Author: Steffen Bleul

buildscripts/buildImage.sh

@@ -9,7 +9,7 @@ function buildImage() {
   if  [ "${branch}" = "master" ]; then
     imagename=$tagname
   else
-    imagename=$tagname-$branch
+    imagename=$tagname-development
   fi
   docker build --no-cache -t blacklabelops/nginx:$imagename --build-arg NGINX_VERSION=$version .
 }

buildscripts/cleanAlpineContainers.sh

@@ -16,7 +16,7 @@ function cleanContainer() {
   if  [ "${branch}" = "master" ]; then
     imagename=$tagname
   else
-    imagename=$tagname-$branch
+    imagename=$tagname-development
   fi
   docker rm -f -v $imagename || true
 }

buildscripts/release.sh

@@ -4,5 +4,4 @@
 # CONTAINER VARIABLES
 #------------------
 export NGINX_VERSION=1.10.1-r1
-git branch
 export BUILD_BRANCH=$(git branch | grep -e "^*" | cut -d' ' -f 2)

buildscripts/testImage.sh

@@ -8,7 +8,7 @@ function testPrintVersion() {
   if  [ "${branch}" = "master" ]; then
     imagename=$tagname
   else
-    imagename=$tagname-$branch
+    imagename=$tagname-development
   fi
   docker run --rm blacklabelops/nginx:$imagename -v
 }
@@ -21,7 +21,7 @@ function testImage() {
   if  [ "${branch}" = "master" ]; then
     imagename=$tagname
   else
-    imagename=$tagname-$branch
+    imagename=$tagname-development
   fi
   docker run -d --name=$imagename blacklabelops/nginx:$imagename
   while ! docker run --rm --link $imagename:nginx blacklabelops/nginx:$imagename curl -v http://nginx