Merge branch 'release/1.3.0'

webdevops · Jan 26, 2017 · 168e6db · 168e6db
2 parents 0652cff + 99a7b31
commit 168e6db
Show file tree

Hide file tree

Showing 347 changed files with 1,241 additions and 442 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/Dockerfile).
 
+## [1.3.0] - 2017-01-26
+- Enabled `docker --user` support
+- Added `service <service> check` for checking if a service is running
+- Added test to check if the services are staying up (see `service <service> check`)
+- Implemented rspec-retry
+- Disabeld php-fpm access logging for production images (default; high log load)
+- Introduced /entrypoit.d (symlink)
+
 ## [1.2.4] - 2017-01-20
 - Enable sshd for php-dev images
 - Set root and application password of php-dev images to "dev"

diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ applications: webdevops/typo3 webdevops/piwik
 misc:      webdevops/mail-sandbox webdevops/sphinx webdevops/liquibase
 
 requirements:
-	pip install -r ./requirements.txt
+	pip install -r ./bin/requirements.txt
 	cd tests/serverspec && bundle install --path=vendor
 
 test:

diff --git a/baselayout/usr/local/bin/service b/baselayout/usr/local/bin/service
@@ -12,7 +12,19 @@ if [ "$(/usr/bin/whoami)" != "root" ]; then
 fi
 
 function serviceHelp() {
-    echo "Usage: $(basename "$0") <servicename> <stop|start|restart|pid|status>"
+    echo "Usage: $(basename "$0") <servicename> <stop|start|restart|pid|status|check>"
+}
+
+function getServicePid() {
+    local serviceName="$1"
+    local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d")
+
+    if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then
+        echo "not running"
+        exit 1
+    fi
+
+    echo $servicePid
 }
 
 # Param check
@@ -42,10 +54,29 @@ esac
 # Action runner
 #############################
 case "$ACTION" in
-    stop|start|restart|pid|status)
+    stop|start|restart|status)
         exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d"
         ;;
 
+    pid)
+        echo $(getServicePid "${SERVICENAME}")
+        ;;
+
+    check)
+        FIRST_PID=$(getServicePid "${SERVICENAME}")
+        sleep 5
+        SECOND_PID=$(getServicePid "${SERVICENAME}")
+
+        if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then
+            echo "ok"
+            exit 0
+        else
+            echo "not running"
+            exit 1
+        fi
+        ;;
+
+
     *)
         echo "[ERROR] Invalid action"
         serviceHelp

diff --git a/bin/command/generate_provision_command.py b/bin/command/generate_provision_command.py
@@ -24,6 +24,7 @@
 import time
 import Queue
 import shutil
+import grp
 from cleo import Output
 from webdevops import Provisioner
 from webdevops.command import BaseCommand
@@ -95,8 +96,17 @@ def __build_base_layout(self):
         if self.option('baselayout'):
             if Output.VERBOSITY_NORMAL <= self.output.get_verbosity():
                 self.line('<info>* </info> Building localscipts')
-            base_path = os.path.join(self.configuration.get('baselayoutPath'), 'baselayout')
-            shutil.make_archive('baselayout', 'bztar', base_path)
+            base_path = self.configuration.get('baselayoutPath')
+
+            root_group = grp.getgrgid(0)
+
+            shutil.make_archive(
+                base_name='baselayout',
+                format='bztar',
+                root_dir=base_path,
+                owner='root',
+                group=root_group.gr_name
+            )
             os.rename('baselayout.tar.bz2', 'baselayout.tar')
 
 

diff --git a/requirements.txt → bin/requirements.txt b/requirements.txt → bin/requirements.txt
diff --git a/docker/ansible/alpine-3/Dockerfile b/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=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
diff --git a/docker/ansible/centos-7/Dockerfile b/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=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
diff --git a/docker/ansible/debian-7/Dockerfile b/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=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
diff --git a/docker/ansible/debian-8/Dockerfile b/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=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
diff --git a/docker/ansible/debian-9/Dockerfile b/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=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/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=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/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=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.10
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-16.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
diff --git a/docker/apache-dev/alpine-3/Dockerfile b/docker/apache-dev/alpine-3/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:alpine-3
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:centos-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:debian-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:debian-8
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:debian-9
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-12.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-14.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.10
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-16.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/alpine-3/Dockerfile b/docker/apache/alpine-3/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:centos-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-8
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-9
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/base-app/alpine-3/Dockerfile b/docker/base-app/alpine-3/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:centos-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-8
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-9
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application