Merge branch 'release/0.21.6'

Author: mblaschke

.gitignore

@@ -1,6 +1,6 @@
 .idea
-testsuite/Dockerfile
-testsuite/vendor/
-testsuite/.bundle/
-testsuite/docker.test.*.tar
+/test/Dockerfile
+/test/vendor/
+/test/.bundle/
+/test/docker.test.*.tar
 *.log

CHANGELOG.md

@@ -1,5 +1,7 @@
 ARGS = $(filter-out $@,$(MAKECMDGOALS))
 MAKEFLAGS += --silent
+.PHONY: test
+
 DOCKER_REPOSITORY=`cat DOCKER_REPOSITORY`
 DOCKER_TAG_LATEST=`cat DOCKER_TAG_LATEST`
 
@@ -22,13 +24,13 @@ applications: webdevops/typo3 webdevops/piwik
 misc:      webdevops/mail-sandbox
 
 test:
-	cd "testsuite/" && make all
+	cd "test/" && make all
 
 test-hub-images:
 	DOCKER_PULL=1 make test
 
 provision:
-	bash .bin/provision.sh
+	bash bin/provision.sh
 
 publish:    dist-update rebuild test push
 
@@ -63,58 +65,58 @@ push:
 	BUILD_MODE=push make all
 
 webdevops/bootstrap:
-	bash .bin/build.sh bootstrap "${DOCKER_REPOSITORY}/bootstrap" "${DOCKER_TAG_LATEST}"
+	bash bin/build.sh bootstrap "${DOCKER_REPOSITORY}/bootstrap" "${DOCKER_TAG_LATEST}"
 
 webdevops/ansible:
-	bash .bin/build.sh bootstrap "${DOCKER_REPOSITORY}/ansible" "${DOCKER_TAG_LATEST}"
+	bash bin/build.sh bootstrap "${DOCKER_REPOSITORY}/ansible" "${DOCKER_TAG_LATEST}"
 
 webdevops/base:
-	bash .bin/build.sh base "${DOCKER_REPOSITORY}/base" "${DOCKER_TAG_LATEST}"
+	bash bin/build.sh base "${DOCKER_REPOSITORY}/base" "${DOCKER_TAG_LATEST}"
 
 webdevops/php:
-	bash .bin/build.sh php "${DOCKER_REPOSITORY}/php" "${DOCKER_TAG_LATEST}"
+	bash bin/build.sh php "${DOCKER_REPOSITORY}/php" "${DOCKER_TAG_LATEST}"
 
 webdevops/apache:
-	bash .bin/build.sh apache "${DOCKER_REPOSITORY}/apache" "${DOCKER_TAG_LATEST}"
+	bash bin/build.sh apache "${DOCKER_REPOSITORY}/apache" "${DOCKER_TAG_LATEST}"
 
 webdevops/nginx:
-	bash .bin/build.sh nginx "${DOCKER_REPOSITORY}/nginx" "${DOCKER_TAG_LATEST}"
+	bash bin/build.sh nginx "${DOCKER_REPOSITORY}/nginx" "${DOCKER_TAG_LATEST}"
 
 webdevops/php-apache:
-	bash .bin/build.sh php-apache "${DOCKER_REPOSITORY}/php-apache" "${DOCKER_TAG_LATEST}"
+	bash bin/build.sh php-apache "${DOCKER_REPOSITORY}/php-apache" "${DOCKER_TAG_LATEST}"
 
 webdevops/php-nginx:
-	bash .bin/build.sh php-nginx "${DOCKER_REPOSITORY}/php-nginx" "${DOCKER_TAG_LATEST}"
+	bash bin/build.sh php-nginx "${DOCKER_REPOSITORY}/php-nginx" "${DOCKER_TAG_LATEST}"
 
 webdevops/hhvm:
-	bash .bin/build.sh hhvm "${DOCKER_REPOSITORY}/hhvm" "${DOCKER_TAG_LATEST}"
+	bash bin/build.sh hhvm "${DOCKER_REPOSITORY}/hhvm" "${DOCKER_TAG_LATEST}"
 
 webdevops/hhvm-apache:
-	bash .bin/build.sh hhvm-apache "${DOCKER_REPOSITORY}/hhvm-apache" "${DOCKER_TAG_LATEST}"
+	bash bin/build.sh hhvm-apache "${DOCKER_REPOSITORY}/hhvm-apache" "${DOCKER_TAG_LATEST}"
 
 webdevops/hhvm-nginx:
-	bash .bin/build.sh hhvm-nginx "${DOCKER_REPOSITORY}/hhvm-nginx" "${DOCKER_TAG_LATEST}"
+	bash bin/build.sh hhvm-nginx "${DOCKER_REPOSITORY}/hhvm-nginx" "${DOCKER_TAG_LATEST}"
 
 webdevops/ssh:
-	bash .bin/build.sh ssh "${DOCKER_REPOSITORY}/ssh" "${DOCKER_TAG_LATEST}"
+	bash bin/build.sh ssh "${DOCKER_REPOSITORY}/ssh" "${DOCKER_TAG_LATEST}"
 
 webdevops/storage:
-	bash .bin/build.sh storage "${DOCKER_REPOSITORY}/storage" "${DOCKER_TAG_LATEST}"
+	bash bin/build.sh storage "${DOCKER_REPOSITORY}/storage" "${DOCKER_TAG_LATEST}"
 
 webdevops/vsftp:
-	bash .bin/build.sh vsftp "${DOCKER_REPOSITORY}/vsftp" "${DOCKER_TAG_LATEST}"
+	bash bin/build.sh vsftp "${DOCKER_REPOSITORY}/vsftp" "${DOCKER_TAG_LATEST}"
 
 webdevops/postfix:
-	bash .bin/build.sh postfix "${DOCKER_REPOSITORY}/postfix" "${DOCKER_TAG_LATEST}"
+	bash bin/build.sh postfix "${DOCKER_REPOSITORY}/postfix" "${DOCKER_TAG_LATEST}"
 
 webdevops/mail-sandbox:
-	bash .bin/build.sh mail-sandbox "${DOCKER_REPOSITORY}/mail-sandbox" "${DOCKER_TAG_LATEST}"
+	bash bin/build.sh mail-sandbox "${DOCKER_REPOSITORY}/mail-sandbox" "${DOCKER_TAG_LATEST}"
 
 webdevops/typo3:
-	bash .bin/build.sh typo3 "${DOCKER_REPOSITORY}/typo3" "${DOCKER_TAG_LATEST}"
+	bash bin/build.sh typo3 "${DOCKER_REPOSITORY}/typo3" "${DOCKER_TAG_LATEST}"
 
 webdevops/piwik:
-	bash .bin/build.sh piwik "${DOCKER_REPOSITORY}/piwik" "${DOCKER_TAG_LATEST}"
+	bash bin/build.sh piwik "${DOCKER_REPOSITORY}/piwik" "${DOCKER_TAG_LATEST}"
 
 webdevops/samson-deployment:
-	bash .bin/build.sh samson-deployment "${DOCKER_REPOSITORY}/samson-deployment" "${DOCKER_TAG_LATEST}"
+	bash bin/build.sh samson-deployment "${DOCKER_REPOSITORY}/samson-deployment" "${DOCKER_TAG_LATEST}"

Makefile

@@ -39,7 +39,7 @@ BASENAME="$2"
 LATEST="$3"
 BASE_DIR="$(pwd)"
 
-source "${BASE_DIR}/.bin/functions.sh"
+source "${BASE_DIR}/bin/functions.sh"
 
 ###
  # Build dockerfile
@@ -60,10 +60,10 @@ function buildDockerfile() {
 
     if [ "${FAST}" -eq 1 ]; then
         LOGFILE="$(mktemp /tmp/docker.build.XXXXXXXXXX)"
-        "${BASE_DIR}/.bin/retry.sh" "${BASE_DIR}/.bin/buildContainer.sh" "${DOCKERFILE_PATH}" "${CONTAINER_NAME}" "${CONTAINER_TAG}" &> "$LOGFILE" &
+        "${BASE_DIR}/bin/retry.sh" "${BASE_DIR}/bin/buildContainer.sh" "${DOCKERFILE_PATH}" "${CONTAINER_NAME}" "${CONTAINER_TAG}" &> "$LOGFILE" &
         addBackgroundPidToList "${CONTAINER_TAG}" "$LOGFILE"
     else
-        "${BASE_DIR}/.bin/retry.sh" "${BASE_DIR}/.bin/buildContainer.sh" "${DOCKERFILE_PATH}" "${CONTAINER_NAME}" "${CONTAINER_TAG}"
+        "${BASE_DIR}/bin/retry.sh" "${BASE_DIR}/bin/buildContainer.sh" "${DOCKERFILE_PATH}" "${CONTAINER_NAME}" "${CONTAINER_TAG}"
     fi
 
     cd "$BASE_DIR"
@@ -88,10 +88,10 @@ function pushDockerfile() {
 
     if [ "${FAST}" -eq 1 ]; then
         LOGFILE="$(mktemp /tmp/docker.push.XXXXXXXXXX)"
-        "${BASE_DIR}/.bin/retry.sh" docker push "${CONTAINER_NAME}:${CONTAINER_TAG}" &> "$LOGFILE" &
+        "${BASE_DIR}/bin/retry.sh" docker push "${CONTAINER_NAME}:${CONTAINER_TAG}" &> "$LOGFILE" &
         addBackgroundPidToList "${CONTAINER_TAG}" "$LOGFILE"
     else
-        "${BASE_DIR}/.bin/retry.sh" docker push "${CONTAINER_NAME}:${CONTAINER_TAG}"
+        "${BASE_DIR}/bin/retry.sh" docker push "${CONTAINER_NAME}:${CONTAINER_TAG}"
     fi
 
     cd "$BASE_DIR"
@@ -206,7 +206,7 @@ sleep 0.5
 # Provision
 #############################
 
-bash "${BASE_DIR}/.bin/provision.sh" "$TARGET"
+bash "${BASE_DIR}/bin/provision.sh" "$TARGET"
 echo ""
 
 #############################
@@ -222,13 +222,13 @@ timerStart
 
 echo "Building ${BASENAME}"
 ## Build each docker tag
-foreachDockerfileInPath "${TARGET}" "buildTarget"
+foreachDockerfileInPath "docker/${TARGET}" "buildTarget"
 
 # wait for build process
 waitForBuildStep
 
 ## Build docker tag latest
-foreachDockerfileInPath "${TARGET}" "buildTargetLatest" "${LATEST}"
+foreachDockerfileInPath "docker/${TARGET}" "buildTargetLatest" "${LATEST}"
 
 # wait for final build
 waitForBuild
@@ -239,8 +239,8 @@ logOutputFromBackgroundProcesses
 case "$BUILD_MODE" in
     build)
         echo ">> Checking built images"
-        foreachDockerfileInPath "${TARGET}" "checkBuild"
-        foreachDockerfileInPath "${TARGET}" "checkBuildLatest" "${LATEST}"
+        foreachDockerfileInPath "docker/${TARGET}" "checkBuild"
+        foreachDockerfileInPath "docker/${TARGET}" "checkBuildLatest" "${LATEST}"
         ;;
 esac
 

README.md

@@ -41,8 +41,9 @@ TAR='tar'
 SCRIPT_DIR=$(dirname "$($READLINK -f "$0")")
 BASE_DIR=$(dirname "$SCRIPT_DIR")
 
-LOCALSCRIPT_DIR="${BASE_DIR}/_localscripts"
-PROVISION_DIR="${BASE_DIR}/_provisioning"
+LOCALSCRIPT_DIR="${BASE_DIR}/localscripts"
+PROVISION_DIR="${BASE_DIR}/provisioning"
+DOCKER_DIR="${BASE_DIR}/docker"
 
 
 ###
@@ -118,7 +119,7 @@ function deployLocalscripts() {
     DOCKER_CONTAINER="$1"
     DOCKER_FILTER="$2"
 
-    listDirectoriesWithFilter "${BASE_DIR}/${DOCKER_CONTAINER}" "${DOCKER_FILTER}"  | while read DOCKER_DIR; do
+    listDirectoriesWithFilter "${DOCKER_DIR}/${DOCKER_CONTAINER}" "${DOCKER_FILTER}"  | while read DOCKER_DIR; do
         if [ -f "${DOCKER_DIR}/Dockerfile" ]; then
             echo "    - $(relativeDir $DOCKER_DIR)"
             cp scripts.tar "${DOCKER_DIR}/scripts.tar"
@@ -144,7 +145,7 @@ function clearConfiguration() {
     DOCKER_FILTER="$2"
 
     echo " -> Clearing configuration"
-    listDirectoriesWithFilter "${BASE_DIR}/${DOCKER_CONTAINER}" "${DOCKER_FILTER}" | while read DOCKER_DIR; do
+    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/"
@@ -173,7 +174,7 @@ function deployConfiguration() {
         echo " -> Deploying configuration with filter '$DOCKER_FILTER'"
     fi
 
-    listDirectoriesWithFilter "${BASE_DIR}/${DOCKER_CONTAINER}" "${DOCKER_FILTER}" | while read DOCKER_DIR; do
+    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/"