Merge branch 'release/0.50.3'

Author: mblaschke

Makefile

@@ -1,6 +1,6 @@
 ARGS = $(filter-out $@,$(MAKECMDGOALS))
 MAKEFLAGS += --silent
-.PHONY: test documentation
+.PHONY: test documentation baselayout provision
 
 DOCKER_REPOSITORY=`cat DOCKER_REPOSITORY`
 DOCKER_TAG_LATEST=`cat DOCKER_TAG_LATEST`
@@ -31,9 +31,12 @@ test:
 test-hub-images:
 	DOCKER_PULL=1 make test
 
+baselayout:
+	BASELAYOUT=1 PROVISION=0 bash bin/provision.sh
+
 provision:
 	python bin/buildDockerfile.py --template=template/ --dockerfile=docker/
-	bash bin/provision.sh
+	BASELAYOUT=0 PROVISION=1 bash bin/provision.sh
 
 publish:    dist-update rebuild test push
 

README.md

@@ -35,6 +35,7 @@ Command                     | Description
 `DEBUG=1 make all`          | Show log of build process even if process is successfull
 `FORCE=1 make all`          | Force container build (`docker build --no-cache ...`)
 <br>                        |
+`make baselayout`           | Build and deploy baselayout.tar
 `make provision`            | Deploy all configuration files from [_provisioning/](_provisioning/README.md)
 `make dist-update`          | Update local distrubtion images (CentOS, Debian, Ubuntu)
 <br>                        |

bin/provision.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [ -n "$1" ]; then
+if [[ -n "$1" ]]; then
     BUILD_TARGET="$1"
 else
     BUILD_TARGET="all"
@@ -11,6 +11,17 @@ if [[ "$BUILD_MODE" == "push" ]]; then
     exit 0
 fi
 
+if [[ "$BASELAYOUT" -eq 1 ]]; then
+    BASELAYOUT=1
+else
+    BASELAYOUT=0
+fi
+
+if [[ "$PROVISION" -eq 1 ]]; then
+    PROVISION=1
+else
+    PROVISION=0
+fi
 
 set -o pipefail  # trace ERR through pipes
 set -o errtrace  # trace ERR through 'time command' and other functions
@@ -105,11 +116,13 @@ function listDirectoriesWithFilter() {
  #
  ##
 function buildBaselayout() {
-    echo " * Building localscripts"
+    if [[ "$BASELAYOUT" -eq 1 ]]; then
+        echo " * Building localscripts"
 
-    cd "${BASELAYOUT_DIR}"
-    rm -f baselayout.tar
-    $TAR -jc --owner=0 --group=0 -f baselayout.tar *
+        cd "${BASELAYOUT_DIR}"
+        rm -f baselayout.tar
+        $TAR -jc --owner=0 --group=0 -f baselayout.tar *
+    fi
 }
 
 ###
@@ -119,15 +132,17 @@ function buildBaselayout() {
  #
  ##
 function deployBaselayout() {
-    DOCKER_CONTAINER="$1"
-    DOCKER_FILTER="$2"
-
-    listDirectoriesWithFilter "${DOCKER_DIR}/${DOCKER_CONTAINER}" "${DOCKER_FILTER}"  | while read DOCKER_DIR; do
-        if [ -f "${DOCKER_DIR}/Dockerfile" ]; then
-            echo "    - $(relativeDir $DOCKER_DIR)"
-            cp baselayout.tar "${DOCKER_DIR}/baselayout.tar"
-        fi
-    done
+    if [[ "$BASELAYOUT" -eq 1 ]]; then
+        DOCKER_CONTAINER="$1"
+        DOCKER_FILTER="$2"
+
+        listDirectoriesWithFilter "${DOCKER_DIR}/${DOCKER_CONTAINER}" "${DOCKER_FILTER}"  | while read DOCKER_DIR; do
+            if [ -f "${DOCKER_DIR}/Dockerfile" ]; then
+                echo "    - $(relativeDir $DOCKER_DIR)"
+                cp baselayout.tar "${DOCKER_DIR}/baselayout.tar"
+            fi
+        done
+    fi
 }
 
 #######################################
@@ -144,16 +159,18 @@ function deployBaselayout() {
  #
  ##
 function clearConfiguration() {
-    DOCKER_CONTAINER="$1"
-    DOCKER_FILTER="$2"
-
-    echo " -> Clearing configuration"
-    listDirectoriesWithFilter "${DOCKER_DIR}/${DOCKER_CONTAINER}" "${DOCKER_FILTER}" | while read DOCKER_DIR; do
-        if [ -f "${DOCKER_DIR}/Dockerfile" ]; then
-            echo "    - $(relativeDir $DOCKER_DIR)"
-            rm -rf "${DOCKER_DIR}/conf/"
-        fi
-    done
+    if [[ "$PROVISION" -eq 1 ]]; then
+        DOCKER_CONTAINER="$1"
+        DOCKER_FILTER="$2"
+
+        echo " -> Clearing configuration"
+        listDirectoriesWithFilter "${DOCKER_DIR}/${DOCKER_CONTAINER}" "${DOCKER_FILTER}" | while read DOCKER_DIR; do
+            if [ -f "${DOCKER_DIR}/Dockerfile" ]; then
+                echo "    - $(relativeDir $DOCKER_DIR)"
+                rm -rf "${DOCKER_DIR}/conf/"
+            fi
+        done
+    fi
 }
 
 ###
@@ -167,22 +184,24 @@ function clearConfiguration() {
  #
  ##
 function deployConfiguration() {
-    PROVISION_SUB_DIR="$1"
-    DOCKER_CONTAINER="$2"
-    DOCKER_FILTER="$3"
-
-    if [ "$DOCKER_FILTER" == "*" ]; then
-        echo " -> Deploying configuration"
-    else
-        echo " -> Deploying configuration with filter '$DOCKER_FILTER'"
-    fi
-
-    listDirectoriesWithFilter "${DOCKER_DIR}/${DOCKER_CONTAINER}" "${DOCKER_FILTER}" | while read DOCKER_DIR; do
-        if [ -f "${DOCKER_DIR}/Dockerfile" ]; then
-            echo "    - $(relativeDir $DOCKER_DIR)"
-            cp -f -r "${PROVISION_DIR}/${PROVISION_SUB_DIR}/." "${DOCKER_DIR}/conf/"
+    if [[ "$PROVISION" -eq 1 ]]; then
+        PROVISION_SUB_DIR="$1"
+        DOCKER_CONTAINER="$2"
+        DOCKER_FILTER="$3"
+
+        if [ "$DOCKER_FILTER" == "*" ]; then
+            echo " -> Deploying configuration"
+        else
+            echo " -> Deploying configuration with filter '$DOCKER_FILTER'"
         fi
-    done
+
+        listDirectoriesWithFilter "${DOCKER_DIR}/${DOCKER_CONTAINER}" "${DOCKER_FILTER}" | while read DOCKER_DIR; do
+            if [ -f "${DOCKER_DIR}/Dockerfile" ]; then
+                echo "    - $(relativeDir $DOCKER_DIR)"
+                cp -f -r "${PROVISION_DIR}/${PROVISION_SUB_DIR}/." "${DOCKER_DIR}/conf/"
+            fi
+        done
+    fi
 }
 
 ###

docker/ansible/alpine-3/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.2
+LABEL io.webdevops.version=0.50.3

docker/ansible/centos-7/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.2
+LABEL io.webdevops.version=0.50.3

docker/ansible/debian-7/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.2
+LABEL io.webdevops.version=0.50.3

docker/ansible/debian-8/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.2
+LABEL io.webdevops.version=0.50.3

docker/ansible/debian-9/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-9
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.2
+LABEL io.webdevops.version=0.50.3

docker/ansible/ubuntu-12.04/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-12.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.2
+LABEL io.webdevops.version=0.50.3

docker/ansible/ubuntu-14.04/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-14.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.2
+LABEL io.webdevops.version=0.50.3