diff --git a/CHANGELOG.md b/CHANGELOG.md index 27d8cea23..324414960 100644 --- 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 check` for checking if a service is running +- Added test to check if the services are staying up (see `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 index 5f741cca9..d71e79632 100644 --- 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 index d3ecbfa86..55ea12bf7 100755 --- 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") " + echo "Usage: $(basename "$0") " +} + +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 index 5ed4d831d..cdf3cec44 100644 --- 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('* 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 b/bin/requirements.txt similarity index 100% rename from requirements.txt rename to bin/requirements.txt diff --git a/docker/ansible/alpine-3/Dockerfile b/docker/ansible/alpine-3/Dockerfile index 5d07f9d19..f5bf776ab 100644 --- a/docker/ansible/alpine-3/Dockerfile +++ b/docker/ansible/alpine-3/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io 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 index 2da5247ae..e3e27cd1c 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7 MAINTAINER info@webdevops.io 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 index 4afae943b..b9ce49ba1 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7 MAINTAINER info@webdevops.io 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 index 5c1189d4f..981b232f1 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8 MAINTAINER info@webdevops.io 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 index 309a13270..2691cd24e 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-9 MAINTAINER info@webdevops.io 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 index 551ce20e7..2b4b405b8 100644 --- 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 info@webdevops.io 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 index 8730ad554..421e03edd 100644 --- 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 info@webdevops.io 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 index 510420de0..4598d2ae8 100644 --- 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 info@webdevops.io 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 index 389083991..0da6add54 100644 --- 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 info@webdevops.io 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 index 59c1efdc5..d47150717 100644 --- 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 info@webdevops.io 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 index b03c5bc48..44f49c053 100644 --- a/docker/apache-dev/alpine-3/Dockerfile +++ b/docker/apache-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:alpine-3 MAINTAINER info@webdevops.io 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 index c96b91e8c..4c3c1bf3f 100644 --- a/docker/apache-dev/centos-7/Dockerfile +++ b/docker/apache-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:centos-7 MAINTAINER info@webdevops.io 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 index 363d45ff7..2f213f43e 100644 --- a/docker/apache-dev/debian-7/Dockerfile +++ b/docker/apache-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-7 MAINTAINER info@webdevops.io 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 index 4cd34252b..50e2c1fe5 100644 --- a/docker/apache-dev/debian-8/Dockerfile +++ b/docker/apache-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-8 MAINTAINER info@webdevops.io 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 index c2ed8391f..672946d15 100644 --- a/docker/apache-dev/debian-9/Dockerfile +++ b/docker/apache-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-9 MAINTAINER info@webdevops.io 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 index 9adb00a72..9a3854b9b 100644 --- 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 info@webdevops.io 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 index 71c1285f2..d572b7e53 100644 --- 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 info@webdevops.io 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 index f1f3e1225..859d49ea8 100644 --- 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 info@webdevops.io 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 index 0f999c03a..a98d91d93 100644 --- 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 info@webdevops.io 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 index 8e8bb3241..e0accdfe9 100644 --- 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 info@webdevops.io 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 index 83c9600df..4a30701d2 100644 --- a/docker/apache/alpine-3/Dockerfile +++ b/docker/apache/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io 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 index 541d75308..8f6a33f1c 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io 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 index 757671162..eaf977b46 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io 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 index 76f2d9a36..d98460fc5 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io 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 index 48981f0aa..b684abae2 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io 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 index 6517a5a9c..bf7ce1100 100644 --- 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 info@webdevops.io 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 index cd47abc78..fd87479d0 100644 --- 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 info@webdevops.io 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 index c57508b18..769196545 100644 --- 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 info@webdevops.io 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 index a7784a7a7..b3b7a2677 100644 --- 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 info@webdevops.io 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 index 6625f046c..f2365f5c4 100644 --- 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 info@webdevops.io 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 index 21b21240f..326242f0e 100644 --- a/docker/base-app/alpine-3/Dockerfile +++ b/docker/base-app/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io 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 index ee9e7f625..4c9b1972e 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io 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 index b680bdf68..35df3b117 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io 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 index b9d3c1c04..866b94c76 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io 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 index bcda2b732..117a26b07 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io 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 index 993fe4210..e4d8c1cea 100644 --- 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 info@webdevops.io 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-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index e2860f6ba..9451ee409 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io 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-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index a4433dee5..a05a806ef 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io 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-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index ae55ff5e0..50d61ef66 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io 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-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index 7ab655be5..850823164 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io 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/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile index a03694efc..7c9d436c8 100644 --- a/docker/base/alpine-3/Dockerfile +++ b/docker/base/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 ENV DOCKER_CONF_HOME /opt/docker/ @@ -24,6 +24,7 @@ RUN chmod +x /opt/docker/bin/* \ curl \ sed \ gnupg \ + && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/base/alpine-3/conf/bin/entrypoint.sh b/docker/base/alpine-3/conf/bin/entrypoint.sh index 03730a757..bbabcdddb 100644 --- a/docker/base/alpine-3/conf/bin/entrypoint.sh +++ b/docker/base/alpine-3/conf/bin/entrypoint.sh @@ -1,10 +1,22 @@ #!/usr/bin/env bash +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + set -o pipefail # trace ERR through pipes set -o errtrace # trace ERR through 'time command' and other functions set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errexit ## set -e : exit the script if any statement returns a non-true return value +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /usr/local/bin/gosu + trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 0de978372..30be03c38 100644 --- a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -1,5 +1,6 @@ --- +- include: bootstrap/system.yml - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml new file mode 100644 index 000000000..0bcf102fe --- /dev/null +++ b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -0,0 +1,8 @@ +--- + +- name: Register logrotate configurations + file: + src: '/opt/docker/provision/entrypoint.d' + dest: '/entrypoint.d' + state: link + force: yes diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/build.yml b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/build.yml index 8a56f9ba9..cd21505a4 100644 --- a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/build.yml +++ b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/build.yml @@ -1,3 +1,2 @@ --- -- include: bootstrap/logrotate.yml diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 93eb8d1b4..7ee9e9018 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 ENV DOCKER_CONF_HOME /opt/docker/ @@ -25,6 +25,7 @@ RUN chmod +x /opt/docker/bin/* \ curl \ net-tools \ gnupg2 \ + && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/base/centos-7/conf/bin/entrypoint.sh b/docker/base/centos-7/conf/bin/entrypoint.sh index 03730a757..bbabcdddb 100644 --- a/docker/base/centos-7/conf/bin/entrypoint.sh +++ b/docker/base/centos-7/conf/bin/entrypoint.sh @@ -1,10 +1,22 @@ #!/usr/bin/env bash +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + set -o pipefail # trace ERR through pipes set -o errtrace # trace ERR through 'time command' and other functions set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errexit ## set -e : exit the script if any statement returns a non-true return value +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /usr/local/bin/gosu + trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL diff --git a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 0de978372..30be03c38 100644 --- a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -1,5 +1,6 @@ --- +- include: bootstrap/system.yml - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml diff --git a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml new file mode 100644 index 000000000..0bcf102fe --- /dev/null +++ b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -0,0 +1,8 @@ +--- + +- name: Register logrotate configurations + file: + src: '/opt/docker/provision/entrypoint.d' + dest: '/entrypoint.d' + state: link + force: yes diff --git a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/build.yml b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/build.yml index 8a56f9ba9..cd21505a4 100644 --- a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/build.yml +++ b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/build.yml @@ -1,3 +1,2 @@ --- -- include: bootstrap/logrotate.yml diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index caa179533..0d4bc2a82 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 ENV DOCKER_CONF_HOME /opt/docker/ @@ -26,6 +26,7 @@ RUN chmod +x /opt/docker/bin/* \ curl \ net-tools \ gnupg \ + && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/base/debian-7/conf/bin/entrypoint.sh b/docker/base/debian-7/conf/bin/entrypoint.sh index 03730a757..bbabcdddb 100644 --- a/docker/base/debian-7/conf/bin/entrypoint.sh +++ b/docker/base/debian-7/conf/bin/entrypoint.sh @@ -1,10 +1,22 @@ #!/usr/bin/env bash +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + set -o pipefail # trace ERR through pipes set -o errtrace # trace ERR through 'time command' and other functions set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errexit ## set -e : exit the script if any statement returns a non-true return value +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /usr/local/bin/gosu + trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL diff --git a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 0de978372..30be03c38 100644 --- a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -1,5 +1,6 @@ --- +- include: bootstrap/system.yml - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml diff --git a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml new file mode 100644 index 000000000..0bcf102fe --- /dev/null +++ b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -0,0 +1,8 @@ +--- + +- name: Register logrotate configurations + file: + src: '/opt/docker/provision/entrypoint.d' + dest: '/entrypoint.d' + state: link + force: yes diff --git a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/build.yml b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/build.yml index 8a56f9ba9..cd21505a4 100644 --- a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/build.yml +++ b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/build.yml @@ -1,3 +1,2 @@ --- -- include: bootstrap/logrotate.yml diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 7e8df2870..72ce23f95 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 ENV DOCKER_CONF_HOME /opt/docker/ @@ -26,6 +26,7 @@ RUN chmod +x /opt/docker/bin/* \ curl \ net-tools \ gnupg \ + && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/base/debian-8/conf/bin/entrypoint.sh b/docker/base/debian-8/conf/bin/entrypoint.sh index 03730a757..bbabcdddb 100644 --- a/docker/base/debian-8/conf/bin/entrypoint.sh +++ b/docker/base/debian-8/conf/bin/entrypoint.sh @@ -1,10 +1,22 @@ #!/usr/bin/env bash +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + set -o pipefail # trace ERR through pipes set -o errtrace # trace ERR through 'time command' and other functions set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errexit ## set -e : exit the script if any statement returns a non-true return value +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /usr/local/bin/gosu + trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL diff --git a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 0de978372..30be03c38 100644 --- a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -1,5 +1,6 @@ --- +- include: bootstrap/system.yml - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml diff --git a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml new file mode 100644 index 000000000..0bcf102fe --- /dev/null +++ b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -0,0 +1,8 @@ +--- + +- name: Register logrotate configurations + file: + src: '/opt/docker/provision/entrypoint.d' + dest: '/entrypoint.d' + state: link + force: yes diff --git a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/build.yml b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/build.yml index 8a56f9ba9..cd21505a4 100644 --- a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/build.yml +++ b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/build.yml @@ -1,3 +1,2 @@ --- -- include: bootstrap/logrotate.yml diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 8c9ebc061..deff64dea 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 ENV DOCKER_CONF_HOME /opt/docker/ @@ -26,6 +26,7 @@ RUN chmod +x /opt/docker/bin/* \ curl \ net-tools \ gnupg \ + && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/base/debian-9/conf/bin/entrypoint.sh b/docker/base/debian-9/conf/bin/entrypoint.sh index 03730a757..bbabcdddb 100644 --- a/docker/base/debian-9/conf/bin/entrypoint.sh +++ b/docker/base/debian-9/conf/bin/entrypoint.sh @@ -1,10 +1,22 @@ #!/usr/bin/env bash +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + set -o pipefail # trace ERR through pipes set -o errtrace # trace ERR through 'time command' and other functions set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errexit ## set -e : exit the script if any statement returns a non-true return value +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /usr/local/bin/gosu + trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL diff --git a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 0de978372..30be03c38 100644 --- a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -1,5 +1,6 @@ --- +- include: bootstrap/system.yml - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml diff --git a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml new file mode 100644 index 000000000..0bcf102fe --- /dev/null +++ b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -0,0 +1,8 @@ +--- + +- name: Register logrotate configurations + file: + src: '/opt/docker/provision/entrypoint.d' + dest: '/entrypoint.d' + state: link + force: yes diff --git a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/build.yml b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/build.yml index 8a56f9ba9..cd21505a4 100644 --- a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/build.yml +++ b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/build.yml @@ -1,3 +1,2 @@ --- -- include: bootstrap/logrotate.yml diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 2d63a78bf..6261346f1 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 ENV DOCKER_CONF_HOME /opt/docker/ @@ -26,6 +26,7 @@ RUN chmod +x /opt/docker/bin/* \ curl \ net-tools \ gnupg \ + && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh index 03730a757..bbabcdddb 100644 --- a/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh @@ -1,10 +1,22 @@ #!/usr/bin/env bash +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + set -o pipefail # trace ERR through pipes set -o errtrace # trace ERR through 'time command' and other functions set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errexit ## set -e : exit the script if any statement returns a non-true return value +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /usr/local/bin/gosu + trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL diff --git a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 0de978372..30be03c38 100644 --- a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -1,5 +1,6 @@ --- +- include: bootstrap/system.yml - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml diff --git a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml new file mode 100644 index 000000000..0bcf102fe --- /dev/null +++ b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -0,0 +1,8 @@ +--- + +- name: Register logrotate configurations + file: + src: '/opt/docker/provision/entrypoint.d' + dest: '/entrypoint.d' + state: link + force: yes diff --git a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/build.yml b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/build.yml index 8a56f9ba9..cd21505a4 100644 --- a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/build.yml +++ b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/build.yml @@ -1,3 +1,2 @@ --- -- include: bootstrap/logrotate.yml diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 36ebf3c7e..f3508ed55 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 ENV DOCKER_CONF_HOME /opt/docker/ @@ -26,6 +26,7 @@ RUN chmod +x /opt/docker/bin/* \ curl \ net-tools \ gnupg \ + && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh index 03730a757..bbabcdddb 100644 --- a/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh @@ -1,10 +1,22 @@ #!/usr/bin/env bash +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + set -o pipefail # trace ERR through pipes set -o errtrace # trace ERR through 'time command' and other functions set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errexit ## set -e : exit the script if any statement returns a non-true return value +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /usr/local/bin/gosu + trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL diff --git a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 0de978372..30be03c38 100644 --- a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -1,5 +1,6 @@ --- +- include: bootstrap/system.yml - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml diff --git a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml new file mode 100644 index 000000000..0bcf102fe --- /dev/null +++ b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -0,0 +1,8 @@ +--- + +- name: Register logrotate configurations + file: + src: '/opt/docker/provision/entrypoint.d' + dest: '/entrypoint.d' + state: link + force: yes diff --git a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/build.yml b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/build.yml index 8a56f9ba9..cd21505a4 100644 --- a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/build.yml +++ b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/build.yml @@ -1,3 +1,2 @@ --- -- include: bootstrap/logrotate.yml diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index be925b814..51914a974 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 ENV DOCKER_CONF_HOME /opt/docker/ @@ -26,6 +26,7 @@ RUN chmod +x /opt/docker/bin/* \ curl \ net-tools \ gnupg \ + && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh index 03730a757..bbabcdddb 100644 --- a/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh @@ -1,10 +1,22 @@ #!/usr/bin/env bash +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + set -o pipefail # trace ERR through pipes set -o errtrace # trace ERR through 'time command' and other functions set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errexit ## set -e : exit the script if any statement returns a non-true return value +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /usr/local/bin/gosu + trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL diff --git a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 0de978372..30be03c38 100644 --- a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -1,5 +1,6 @@ --- +- include: bootstrap/system.yml - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml diff --git a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml new file mode 100644 index 000000000..0bcf102fe --- /dev/null +++ b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -0,0 +1,8 @@ +--- + +- name: Register logrotate configurations + file: + src: '/opt/docker/provision/entrypoint.d' + dest: '/entrypoint.d' + state: link + force: yes diff --git a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/build.yml b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/build.yml index 8a56f9ba9..cd21505a4 100644 --- a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/build.yml +++ b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/build.yml @@ -1,3 +1,2 @@ --- -- include: bootstrap/logrotate.yml diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index c5a3bbaf3..f0448f8b6 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 ENV DOCKER_CONF_HOME /opt/docker/ @@ -26,6 +26,7 @@ RUN chmod +x /opt/docker/bin/* \ curl \ net-tools \ gnupg \ + && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh b/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh index 03730a757..bbabcdddb 100644 --- a/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh @@ -1,10 +1,22 @@ #!/usr/bin/env bash +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + set -o pipefail # trace ERR through pipes set -o errtrace # trace ERR through 'time command' and other functions set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errexit ## set -e : exit the script if any statement returns a non-true return value +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /usr/local/bin/gosu + trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL diff --git a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 0de978372..30be03c38 100644 --- a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -1,5 +1,6 @@ --- +- include: bootstrap/system.yml - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml diff --git a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml new file mode 100644 index 000000000..0bcf102fe --- /dev/null +++ b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -0,0 +1,8 @@ +--- + +- name: Register logrotate configurations + file: + src: '/opt/docker/provision/entrypoint.d' + dest: '/entrypoint.d' + state: link + force: yes diff --git a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/build.yml b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/build.yml index 8a56f9ba9..cd21505a4 100644 --- a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/build.yml +++ b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/build.yml @@ -1,3 +1,2 @@ --- -- include: bootstrap/logrotate.yml diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index 0e3f0c7d3..6113fe4e4 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 ENV DOCKER_CONF_HOME /opt/docker/ @@ -26,6 +26,7 @@ RUN chmod +x /opt/docker/bin/* \ curl \ net-tools \ gnupg \ + && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh index 03730a757..bbabcdddb 100644 --- a/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh @@ -1,10 +1,22 @@ #!/usr/bin/env bash +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + set -o pipefail # trace ERR through pipes set -o errtrace # trace ERR through 'time command' and other functions set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errexit ## set -e : exit the script if any statement returns a non-true return value +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /usr/local/bin/gosu + trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL diff --git a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 0de978372..30be03c38 100644 --- a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -1,5 +1,6 @@ --- +- include: bootstrap/system.yml - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml diff --git a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml new file mode 100644 index 000000000..0bcf102fe --- /dev/null +++ b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -0,0 +1,8 @@ +--- + +- name: Register logrotate configurations + file: + src: '/opt/docker/provision/entrypoint.d' + dest: '/entrypoint.d' + state: link + force: yes diff --git a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/build.yml b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/build.yml index 8a56f9ba9..cd21505a4 100644 --- a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/build.yml +++ b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/build.yml @@ -1,3 +1,2 @@ --- -- include: bootstrap/logrotate.yml diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index 22078db95..bef9a5eea 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM alpine:3.5 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -46,6 +46,22 @@ RUN set -x \ && hash -r \ && pip install ansible \ && chmod 750 /usr/bin/ansible* \ + # Install gosu + && GOSU_VERSION=1.10 \ + && apk add --no-cache --virtual .gosu-deps \ + dpkg \ + gnupg \ + openssl \ + && dpkgArch="amd64" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true \ + && apk del .gosu-deps \ # Cleanup && apk del python-dev \ && find /var/log/ -mindepth 1 -delete diff --git a/docker/bootstrap/alpine-3/baselayout.tar b/docker/bootstrap/alpine-3/baselayout.tar index 59e4b1d50..8c249f50c 100644 Binary files a/docker/bootstrap/alpine-3/baselayout.tar and b/docker/bootstrap/alpine-3/baselayout.tar differ diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index f1d4970e8..599b048af 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM centos:7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -40,6 +40,20 @@ RUN set -x \ && hash -r \ && pip install ansible \ && chmod 750 /usr/bin/ansible* \ + # Install gosu + && GOSU_VERSION=1.10 \ + && /usr/local/bin/yum-install gpg wget \ + && dpkgArch="amd64" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true \ + && yum erase -y wget \ + # Cleanup && yum erase -y python-devel \ && yum clean all \ && find /var/log/ -mindepth 1 -delete diff --git a/docker/bootstrap/centos-7/baselayout.tar b/docker/bootstrap/centos-7/baselayout.tar index 59e4b1d50..8c249f50c 100644 Binary files a/docker/bootstrap/centos-7/baselayout.tar and b/docker/bootstrap/centos-7/baselayout.tar differ diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index cef8b30f9..b7edc9705 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM debian:7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -49,6 +49,19 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && hash -r \ && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ + # Install gosu + && GOSU_VERSION=1.10 \ + && /usr/local/bin/apt-install wget gnupg dirmngr \ + && dpkgArch="amd64" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true \ + && apt-get purge -y -f --force-yes wget dirmngr \ # Cleanup && apt-get purge -y -f --force-yes \ python-dev \ diff --git a/docker/bootstrap/debian-7/baselayout.tar b/docker/bootstrap/debian-7/baselayout.tar index 59e4b1d50..8c249f50c 100644 Binary files a/docker/bootstrap/debian-7/baselayout.tar and b/docker/bootstrap/debian-7/baselayout.tar differ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 2a416b84c..d1b66e3ac 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM debian:8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -49,6 +49,19 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && hash -r \ && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ + # Install gosu + && GOSU_VERSION=1.10 \ + && /usr/local/bin/apt-install wget gnupg dirmngr \ + && dpkgArch="amd64" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true \ + && apt-get purge -y -f --force-yes wget dirmngr \ # Cleanup && apt-get purge -y -f --force-yes \ python-dev \ diff --git a/docker/bootstrap/debian-8/baselayout.tar b/docker/bootstrap/debian-8/baselayout.tar index 59e4b1d50..8c249f50c 100644 Binary files a/docker/bootstrap/debian-8/baselayout.tar and b/docker/bootstrap/debian-8/baselayout.tar differ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index fdf0f7b96..bcde42b1f 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM debian:stretch MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -49,6 +49,19 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && hash -r \ && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ + # Install gosu + && GOSU_VERSION=1.10 \ + && /usr/local/bin/apt-install wget gnupg dirmngr \ + && dpkgArch="amd64" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true \ + && apt-get purge -y -f --force-yes wget dirmngr \ # Cleanup && apt-get purge -y -f --force-yes \ python-dev \ diff --git a/docker/bootstrap/debian-9/baselayout.tar b/docker/bootstrap/debian-9/baselayout.tar index 59e4b1d50..8c249f50c 100644 Binary files a/docker/bootstrap/debian-9/baselayout.tar and b/docker/bootstrap/debian-9/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 07c3c1966..5ec037f23 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -50,6 +50,19 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && hash -r \ && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ + # Install gosu + && GOSU_VERSION=1.10 \ + && /usr/local/bin/apt-install wget gnupg \ + && dpkgArch="amd64" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true \ + && apt-get purge -y -f --force-yes wget \ # Cleanup && apt-get purge -y -f --force-yes \ python-dev \ diff --git a/docker/bootstrap/ubuntu-12.04/baselayout.tar b/docker/bootstrap/ubuntu-12.04/baselayout.tar index 59e4b1d50..8c249f50c 100644 Binary files a/docker/bootstrap/ubuntu-12.04/baselayout.tar and b/docker/bootstrap/ubuntu-12.04/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 738095301..d8c7de936 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -48,6 +48,19 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && hash -r \ && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ + # Install gosu + && GOSU_VERSION=1.10 \ + && /usr/local/bin/apt-install wget gnupg \ + && dpkgArch="amd64" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true \ + && apt-get purge -y -f --force-yes wget \ # Cleanup && apt-get purge -y -f --force-yes \ python-dev \ diff --git a/docker/bootstrap/ubuntu-14.04/baselayout.tar b/docker/bootstrap/ubuntu-14.04/baselayout.tar index 59e4b1d50..8c249f50c 100644 Binary files a/docker/bootstrap/ubuntu-14.04/baselayout.tar and b/docker/bootstrap/ubuntu-14.04/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 20f4d49fe..ba7de3802 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -48,6 +48,19 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && hash -r \ && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ + # Install gosu + && GOSU_VERSION=1.10 \ + && /usr/local/bin/apt-install wget gnupg \ + && dpkgArch="amd64" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true \ + && apt-get purge -y -f --force-yes wget \ # Cleanup && apt-get purge -y -f --force-yes \ python-dev \ diff --git a/docker/bootstrap/ubuntu-15.04/baselayout.tar b/docker/bootstrap/ubuntu-15.04/baselayout.tar index 59e4b1d50..8c249f50c 100644 Binary files a/docker/bootstrap/ubuntu-15.04/baselayout.tar and b/docker/bootstrap/ubuntu-15.04/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index b83142346..a8e089b2c 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -48,6 +48,19 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && hash -r \ && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ + # Install gosu + && GOSU_VERSION=1.10 \ + && /usr/local/bin/apt-install wget gnupg \ + && dpkgArch="amd64" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true \ + && apt-get purge -y -f --force-yes wget \ # Cleanup && apt-get purge -y -f --force-yes \ python-dev \ diff --git a/docker/bootstrap/ubuntu-15.10/baselayout.tar b/docker/bootstrap/ubuntu-15.10/baselayout.tar index 59e4b1d50..8c249f50c 100644 Binary files a/docker/bootstrap/ubuntu-15.10/baselayout.tar and b/docker/bootstrap/ubuntu-15.10/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 2a76c1099..fe8587edf 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -48,6 +48,19 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && hash -r \ && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ + # Install gosu + && GOSU_VERSION=1.10 \ + && /usr/local/bin/apt-install wget gnupg \ + && dpkgArch="amd64" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true \ + && apt-get purge -y -f --force-yes wget \ # Cleanup && apt-get purge -y -f --force-yes \ python-dev \ diff --git a/docker/bootstrap/ubuntu-16.04/baselayout.tar b/docker/bootstrap/ubuntu-16.04/baselayout.tar index 59e4b1d50..8c249f50c 100644 Binary files a/docker/bootstrap/ubuntu-16.04/baselayout.tar and b/docker/bootstrap/ubuntu-16.04/baselayout.tar differ diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile index 3c1e770c2..7d4dbe01b 100644 --- a/docker/certbot/latest/Dockerfile +++ b/docker/certbot/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 VOLUME /etc/letsencrypt VOLUME /var/www diff --git a/docker/hhvm-apache/ubuntu-14.04/Dockerfile b/docker/hhvm-apache/ubuntu-14.04/Dockerfile index d10f92855..68bb44ac2 100644 --- a/docker/hhvm-apache/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-14.04 MAINTAINER info@webdevops.io 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/hhvm-apache/ubuntu-16.04/Dockerfile b/docker/hhvm-apache/ubuntu-16.04/Dockerfile index 892a49b33..23e5a2b29 100644 --- a/docker/hhvm-apache/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-16.04 MAINTAINER info@webdevops.io 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/hhvm-nginx/ubuntu-14.04/Dockerfile b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile index 236c3da4b..7491bbab9 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-14.04 MAINTAINER info@webdevops.io 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/hhvm-nginx/ubuntu-16.04/Dockerfile b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile index d7b72ec37..3b5c9f699 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-16.04 MAINTAINER info@webdevops.io 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/hhvm/ubuntu-14.04/Dockerfile b/docker/hhvm/ubuntu-14.04/Dockerfile index 8a29d7171..54f2f62fc 100644 --- a/docker/hhvm/ubuntu-14.04/Dockerfile +++ b/docker/hhvm/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-14.04 MAINTAINER info@webdevops.io 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/hhvm/ubuntu-14.04/conf/bin/service.d/hhvm.sh b/docker/hhvm/ubuntu-14.04/conf/bin/service.d/hhvm.sh index ff0a26578..77d176cd7 100644 --- a/docker/hhvm/ubuntu-14.04/conf/bin/service.d/hhvm.sh +++ b/docker/hhvm/ubuntu-14.04/conf/bin/service.d/hhvm.sh @@ -4,4 +4,8 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/hhvm.d/" -exec /usr/bin/hhvm --mode server -vServer.Type=fastcgi -vServer.Port=9000 +if [[ -z "$CONTAINER_UID" ]]; then + CONTAINER_UID="application" +fi + +exec /usr/bin/hhvm --mode server -vServer.Type=fastcgi -vServer.Port=9000 --user "${CONTAINER_UID}" diff --git a/docker/hhvm/ubuntu-14.04/conf/etc/supervisor.d/hhvm.conf b/docker/hhvm/ubuntu-14.04/conf/etc/supervisor.d/hhvm.conf index 7a4fc0e29..44ddf7d35 100644 --- a/docker/hhvm/ubuntu-14.04/conf/etc/supervisor.d/hhvm.conf +++ b/docker/hhvm/ubuntu-14.04/conf/etc/supervisor.d/hhvm.conf @@ -6,7 +6,6 @@ priority=20 command = /opt/docker/bin/service.d/hhvm.sh process_name=%(program_name)s directory = /var/run/hhvm/ -user = application startsecs = 0 autostart = true autorestart = true diff --git a/docker/hhvm/ubuntu-16.04/Dockerfile b/docker/hhvm/ubuntu-16.04/Dockerfile index ff7d318eb..897a0d544 100644 --- a/docker/hhvm/ubuntu-16.04/Dockerfile +++ b/docker/hhvm/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-16.04 MAINTAINER info@webdevops.io 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/hhvm/ubuntu-16.04/conf/bin/service.d/hhvm.sh b/docker/hhvm/ubuntu-16.04/conf/bin/service.d/hhvm.sh index ff0a26578..77d176cd7 100644 --- a/docker/hhvm/ubuntu-16.04/conf/bin/service.d/hhvm.sh +++ b/docker/hhvm/ubuntu-16.04/conf/bin/service.d/hhvm.sh @@ -4,4 +4,8 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/hhvm.d/" -exec /usr/bin/hhvm --mode server -vServer.Type=fastcgi -vServer.Port=9000 +if [[ -z "$CONTAINER_UID" ]]; then + CONTAINER_UID="application" +fi + +exec /usr/bin/hhvm --mode server -vServer.Type=fastcgi -vServer.Port=9000 --user "${CONTAINER_UID}" diff --git a/docker/hhvm/ubuntu-16.04/conf/etc/supervisor.d/hhvm.conf b/docker/hhvm/ubuntu-16.04/conf/etc/supervisor.d/hhvm.conf index 7a4fc0e29..44ddf7d35 100644 --- a/docker/hhvm/ubuntu-16.04/conf/etc/supervisor.d/hhvm.conf +++ b/docker/hhvm/ubuntu-16.04/conf/etc/supervisor.d/hhvm.conf @@ -6,7 +6,6 @@ priority=20 command = /opt/docker/bin/service.d/hhvm.sh process_name=%(program_name)s directory = /var/run/hhvm/ -user = application startsecs = 0 autostart = true autorestart = true diff --git a/docker/liquibase/latest/Dockerfile b/docker/liquibase/latest/Dockerfile index 5beb0e867..bdd6a388b 100644 --- a/docker/liquibase/latest/Dockerfile +++ b/docker/liquibase/latest/Dockerfile @@ -8,7 +8,7 @@ FROM java:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 ENV LIQUIBASE_VERSION "3.5.3" ENV LIQUIBASE_DRIVER "com.mysql.jdbc.Driver" diff --git a/docker/liquibase/mysql/Dockerfile b/docker/liquibase/mysql/Dockerfile index 4abc1dcc3..eea95227a 100644 --- a/docker/liquibase/mysql/Dockerfile +++ b/docker/liquibase/mysql/Dockerfile @@ -8,7 +8,7 @@ FROM java:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 ENV LIQUIBASE_VERSION "3.5.3" ENV LIQUIBASE_DRIVER "com.mysql.jdbc.Driver" diff --git a/docker/liquibase/postgres/Dockerfile b/docker/liquibase/postgres/Dockerfile index 5cf03fe5c..d3d8cb6d6 100644 --- a/docker/liquibase/postgres/Dockerfile +++ b/docker/liquibase/postgres/Dockerfile @@ -8,7 +8,7 @@ FROM java:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 ENV LIQUIBASE_VERSION "3.5.3" ENV LIQUIBASE_DRIVER "org.postgresql.Driver" diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index a266b4773..26cfebd16 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-nginx:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 ENV MAILBOX_USERNAME "dev" ENV MAILBOX_PASSWORD "dev" diff --git a/docker/nginx-dev/alpine-3/Dockerfile b/docker/nginx-dev/alpine-3/Dockerfile index 53d270a92..9ed23cec9 100644 --- a/docker/nginx-dev/alpine-3/Dockerfile +++ b/docker/nginx-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:alpine-3 MAINTAINER info@webdevops.io 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/nginx-dev/centos-7/Dockerfile b/docker/nginx-dev/centos-7/Dockerfile index 25df11dc3..3b144ac70 100644 --- a/docker/nginx-dev/centos-7/Dockerfile +++ b/docker/nginx-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:centos-7 MAINTAINER info@webdevops.io 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/nginx-dev/debian-7/Dockerfile b/docker/nginx-dev/debian-7/Dockerfile index 460ae19b6..a6e871732 100644 --- a/docker/nginx-dev/debian-7/Dockerfile +++ b/docker/nginx-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:debian-7 MAINTAINER info@webdevops.io 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/nginx-dev/debian-8/Dockerfile b/docker/nginx-dev/debian-8/Dockerfile index a2b31fcfb..f7e51d4e9 100644 --- a/docker/nginx-dev/debian-8/Dockerfile +++ b/docker/nginx-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:debian-8 MAINTAINER info@webdevops.io 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/nginx-dev/debian-9/Dockerfile b/docker/nginx-dev/debian-9/Dockerfile index eba08089b..d826cc47f 100644 --- a/docker/nginx-dev/debian-9/Dockerfile +++ b/docker/nginx-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:debian-9 MAINTAINER info@webdevops.io 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/nginx-dev/ubuntu-12.04/Dockerfile b/docker/nginx-dev/ubuntu-12.04/Dockerfile index c2889e3b7..7eefdb5b4 100644 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-12.04 MAINTAINER info@webdevops.io 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/nginx-dev/ubuntu-14.04/Dockerfile b/docker/nginx-dev/ubuntu-14.04/Dockerfile index 1baa00d8d..66441e36a 100644 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-14.04 MAINTAINER info@webdevops.io 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/nginx-dev/ubuntu-15.04/Dockerfile b/docker/nginx-dev/ubuntu-15.04/Dockerfile index ec0973fde..987070fc9 100644 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-15.04 MAINTAINER info@webdevops.io 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/nginx-dev/ubuntu-15.10/Dockerfile b/docker/nginx-dev/ubuntu-15.10/Dockerfile index 95225a45a..8b323748d 100644 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-15.10 MAINTAINER info@webdevops.io 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/nginx-dev/ubuntu-16.04/Dockerfile b/docker/nginx-dev/ubuntu-16.04/Dockerfile index 52dfdb406..17ebaccf5 100644 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-16.04 MAINTAINER info@webdevops.io 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/nginx/alpine-3/Dockerfile b/docker/nginx/alpine-3/Dockerfile index 2731b4f7a..07426aca2 100644 --- a/docker/nginx/alpine-3/Dockerfile +++ b/docker/nginx/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io 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/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index d9286cc5f..1f3f603f5 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io 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/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index 00b1fff4d..d5c091c62 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io 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/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index 93bf27ae3..532351dc7 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io 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/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index deb75b91a..6472e0b8f 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io 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/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index 4487c538a..d0ab35764 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io 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/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index ea7c12423..69ed8bbfd 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io 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/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index 587a67980..3e2657bcd 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io 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/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index fb663d665..ef18f5e73 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io 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/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index 712237f74..cfdd70526 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io 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/php-apache-dev/alpine-3-php7/Dockerfile b/docker/php-apache-dev/alpine-3-php7/Dockerfile index b1dbf7fec..e20cf24e1 100644 --- a/docker/php-apache-dev/alpine-3-php7/Dockerfile +++ b/docker/php-apache-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3-php7 MAINTAINER info@webdevops.io 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/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-apache-dev/alpine-3/Dockerfile b/docker/php-apache-dev/alpine-3/Dockerfile index a490b8eb2..52db8c217 100644 --- a/docker/php-apache-dev/alpine-3/Dockerfile +++ b/docker/php-apache-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3 MAINTAINER info@webdevops.io 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/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile index 40e294592..695c9a1aa 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7-php56 MAINTAINER info@webdevops.io 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/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile index 7bf9b9f3c..445b4f292 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7 MAINTAINER info@webdevops.io 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/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile index 53da42b94..026a8eb3f 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-7 MAINTAINER info@webdevops.io 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/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile index 4f7508356..49853f199 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8-php7 MAINTAINER info@webdevops.io 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/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile index 6bae1ebfb..9013d4ed9 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8 MAINTAINER info@webdevops.io 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/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile index 64bf46e98..fd780cc78 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-9 MAINTAINER info@webdevops.io 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/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile index 176333546..2e74c9bfa 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-12.04 MAINTAINER info@webdevops.io 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/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile index f8f0d0364..b6e73dc49 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-14.04 MAINTAINER info@webdevops.io 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/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile index 3a114ccf9..a1dd13661 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.04 MAINTAINER info@webdevops.io 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/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile index ffd782d60..57cb07c77 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.10 MAINTAINER info@webdevops.io 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/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile index bbebda939..e2e68e517 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-16.04 MAINTAINER info@webdevops.io 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/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-apache/alpine-3-php7/Dockerfile b/docker/php-apache/alpine-3-php7/Dockerfile index e52773120..e064055d0 100644 --- a/docker/php-apache/alpine-3-php7/Dockerfile +++ b/docker/php-apache/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io 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/php-apache/alpine-3/Dockerfile b/docker/php-apache/alpine-3/Dockerfile index 2f01a4751..5ad416ee2 100644 --- a/docker/php-apache/alpine-3/Dockerfile +++ b/docker/php-apache/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io 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/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile index 0e265bd23..d1850c614 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io 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/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index 9496871ac..3bc6c3952 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io 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/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index 14eba71dc..a3deb54b3 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io 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/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index b584bf985..009e7ae15 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io 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/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index a99ebd6e8..c1381d9e3 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io 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/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index ea7eb4c9e..0f13bd74e 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io 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/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index e9229773e..c858d3364 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io 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/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index bb64f7eae..66f30c1eb 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io 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/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index 9a84e281e..58b31f50a 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io 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/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index 0c5e971f3..9b6f61dd0 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io 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/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index aec677e91..b90d0fcc2 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io 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/php-dev/alpine-3-php7/Dockerfile b/docker/php-dev/alpine-3-php7/Dockerfile index d5d3223f5..0198366c6 100644 --- a/docker/php-dev/alpine-3-php7/Dockerfile +++ b/docker/php-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine-3/Dockerfile index c826e5f7d..fb808f322 100644 --- a/docker/php-dev/alpine-3/Dockerfile +++ b/docker/php-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index 8beadb2ff..a7725bd01 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index d6ea9fc72..e68cff722 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index 2f26b8aac..43604beb9 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index c026d0a03..eae7cb6ba 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index 62de3697c..2884914db 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index a4a656a4d..4e710a43f 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index 0d99aa7b7..25c33e222 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index 158ba62eb..1c926cae2 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index 823082ebe..0e69a3afc 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index d4a4105a6..99d9ef836 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index c99db9111..f26a220b9 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-nginx-dev/alpine-3-php7/Dockerfile b/docker/php-nginx-dev/alpine-3-php7/Dockerfile index eabefa420..97a955422 100644 --- a/docker/php-nginx-dev/alpine-3-php7/Dockerfile +++ b/docker/php-nginx-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3-php7 MAINTAINER info@webdevops.io 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/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile b/docker/php-nginx-dev/alpine-3/Dockerfile index 448eba2ba..2eb044cef 100644 --- a/docker/php-nginx-dev/alpine-3/Dockerfile +++ b/docker/php-nginx-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3 MAINTAINER info@webdevops.io 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/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile index e5578b849..19b07fc2f 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7-php56 MAINTAINER info@webdevops.io 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/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index eb71cfbc0..c5564fa1b 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7 MAINTAINER info@webdevops.io 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/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index 3841a7cc4..309da09e0 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-7 MAINTAINER info@webdevops.io 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/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index ae5c69734..f1ab55f3e 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8-php7 MAINTAINER info@webdevops.io 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/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index e6e6d1988..13b5d7c64 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8 MAINTAINER info@webdevops.io 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/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index bc67e6630..f73789e0c 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-9 MAINTAINER info@webdevops.io 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/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index 6fce97e5b..8e669a203 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-12.04 MAINTAINER info@webdevops.io 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/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index 6b6eb19a6..47eb29e96 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-14.04 MAINTAINER info@webdevops.io 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/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index 7eaf0dd37..58d64f0bd 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.04 MAINTAINER info@webdevops.io 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/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index 1ac5b531b..a9342edb7 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.10 MAINTAINER info@webdevops.io 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/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index 01008fa8f..297daf1de 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-16.04 MAINTAINER info@webdevops.io 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/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/docker/php-nginx/alpine-3-php7/Dockerfile b/docker/php-nginx/alpine-3-php7/Dockerfile index 23f9162e4..042fad739 100644 --- a/docker/php-nginx/alpine-3-php7/Dockerfile +++ b/docker/php-nginx/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io 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/php-nginx/alpine-3/Dockerfile b/docker/php-nginx/alpine-3/Dockerfile index 278d199bf..8d47a82cd 100644 --- a/docker/php-nginx/alpine-3/Dockerfile +++ b/docker/php-nginx/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io 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/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index e0f41ba20..fbd4c39ce 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io 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/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index f7ae0e8e4..e8f98591b 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io 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/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index 6c3ae8d5d..83b72bbe9 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io 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/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index 20ab74798..e00f35175 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io 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/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index 9b2abc120..508655021 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io 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/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index f4ebbab5a..d2b0636cf 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io 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/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index c0f5b9bea..163e0caf8 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io 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/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index f5b378441..5112da09a 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io 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/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index 227535e16..8f50f0ba7 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io 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/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index 3c3ae5461..bc1f12edc 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io 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/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index e3bdfe00d..e45af369d 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io 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/php/alpine-3-php7/Dockerfile b/docker/php/alpine-3-php7/Dockerfile index 0cf5aabbd..52aa81f6b 100644 --- a/docker/php/alpine-3-php7/Dockerfile +++ b/docker/php/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:alpine-3 MAINTAINER info@webdevops.io 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/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/10-init.sh index fdffa2a0f..312fcd043 100644 --- a/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/10-init.sh +++ b/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/10-init.sh @@ -1 +1,8 @@ -# placeholder +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + sed -i "s/user[ ]*=.*/user = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" + sed -i "s/group[ ]*=.*/group = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" +fi diff --git a/docker/php/alpine-3/Dockerfile b/docker/php/alpine-3/Dockerfile index e284bd7a9..e5efe63ca 100644 --- a/docker/php/alpine-3/Dockerfile +++ b/docker/php/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:alpine-3 MAINTAINER info@webdevops.io 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/php/alpine-3/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/10-init.sh index fdffa2a0f..312fcd043 100644 --- a/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/10-init.sh +++ b/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/10-init.sh @@ -1 +1,8 @@ -# placeholder +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + sed -i "s/user[ ]*=.*/user = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" + sed -i "s/group[ ]*=.*/group = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" +fi diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 1c9599309..53ee9dfe1 100644 --- a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -63,7 +63,7 @@ owner: "root" group: "root" -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' @@ -72,13 +72,20 @@ - { key: 'listen', value: "0.0.0.0:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - - { key: 'access.log', value: "/docker.stdout" } - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.conf) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: ';{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'access.log', value: "/docker.stdout" } + - name: Disable clear env in php-fpm pool lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index dee9f60a0..1cef091e1 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:centos-7 MAINTAINER info@webdevops.io 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/php/centos-7-php56/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.d/10-init.sh index fdffa2a0f..312fcd043 100644 --- a/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.d/10-init.sh +++ b/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.d/10-init.sh @@ -1 +1,8 @@ -# placeholder +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + sed -i "s/user[ ]*=.*/user = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" + sed -i "s/group[ ]*=.*/group = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" +fi diff --git a/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 1c9599309..53ee9dfe1 100644 --- a/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -63,7 +63,7 @@ owner: "root" group: "root" -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' @@ -72,13 +72,20 @@ - { key: 'listen', value: "0.0.0.0:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - - { key: 'access.log', value: "/docker.stdout" } - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.conf) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: ';{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'access.log', value: "/docker.stdout" } + - name: Disable clear env in php-fpm pool lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index b5fc6e0bd..24032b59d 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:centos-7 MAINTAINER info@webdevops.io 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/php/centos-7/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/centos-7/conf/bin/service.d/php-fpm.d/10-init.sh index fdffa2a0f..312fcd043 100644 --- a/docker/php/centos-7/conf/bin/service.d/php-fpm.d/10-init.sh +++ b/docker/php/centos-7/conf/bin/service.d/php-fpm.d/10-init.sh @@ -1 +1,8 @@ -# placeholder +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + sed -i "s/user[ ]*=.*/user = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" + sed -i "s/group[ ]*=.*/group = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" +fi diff --git a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 1c9599309..53ee9dfe1 100644 --- a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -63,7 +63,7 @@ owner: "root" group: "root" -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' @@ -72,13 +72,20 @@ - { key: 'listen', value: "0.0.0.0:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - - { key: 'access.log', value: "/docker.stdout" } - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.conf) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: ';{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'access.log', value: "/docker.stdout" } + - name: Disable clear env in php-fpm pool lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index 1ad1c8580..c41404f66 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-7 MAINTAINER info@webdevops.io 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/php/debian-7/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/debian-7/conf/bin/service.d/php-fpm.d/10-init.sh index fdffa2a0f..312fcd043 100644 --- a/docker/php/debian-7/conf/bin/service.d/php-fpm.d/10-init.sh +++ b/docker/php/debian-7/conf/bin/service.d/php-fpm.d/10-init.sh @@ -1 +1,8 @@ -# placeholder +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + sed -i "s/user[ ]*=.*/user = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" + sed -i "s/group[ ]*=.*/group = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" +fi diff --git a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 1c9599309..53ee9dfe1 100644 --- a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -63,7 +63,7 @@ owner: "root" group: "root" -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' @@ -72,13 +72,20 @@ - { key: 'listen', value: "0.0.0.0:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - - { key: 'access.log', value: "/docker.stdout" } - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.conf) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: ';{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'access.log', value: "/docker.stdout" } + - name: Disable clear env in php-fpm pool lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index 92377beab..e59686cec 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-8 MAINTAINER info@webdevops.io 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/php/debian-8-php7/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/10-init.sh index fdffa2a0f..312fcd043 100644 --- a/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/10-init.sh +++ b/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/10-init.sh @@ -1 +1,8 @@ -# placeholder +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + sed -i "s/user[ ]*=.*/user = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" + sed -i "s/group[ ]*=.*/group = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" +fi diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index bfb09b717..616bc913a 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-8 MAINTAINER info@webdevops.io 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/php/debian-8/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/debian-8/conf/bin/service.d/php-fpm.d/10-init.sh index fdffa2a0f..312fcd043 100644 --- a/docker/php/debian-8/conf/bin/service.d/php-fpm.d/10-init.sh +++ b/docker/php/debian-8/conf/bin/service.d/php-fpm.d/10-init.sh @@ -1 +1,8 @@ -# placeholder +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + sed -i "s/user[ ]*=.*/user = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" + sed -i "s/group[ ]*=.*/group = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" +fi diff --git a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 1c9599309..53ee9dfe1 100644 --- a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -63,7 +63,7 @@ owner: "root" group: "root" -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' @@ -72,13 +72,20 @@ - { key: 'listen', value: "0.0.0.0:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - - { key: 'access.log', value: "/docker.stdout" } - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.conf) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: ';{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'access.log', value: "/docker.stdout" } + - name: Disable clear env in php-fpm pool lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index bf9aa9b3c..00cc93e43 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-9 MAINTAINER info@webdevops.io 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/php/debian-9/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/debian-9/conf/bin/service.d/php-fpm.d/10-init.sh index fdffa2a0f..312fcd043 100644 --- a/docker/php/debian-9/conf/bin/service.d/php-fpm.d/10-init.sh +++ b/docker/php/debian-9/conf/bin/service.d/php-fpm.d/10-init.sh @@ -1 +1,8 @@ -# placeholder +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + sed -i "s/user[ ]*=.*/user = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" + sed -i "s/group[ ]*=.*/group = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" +fi diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index 5b40265e5..53c0d0ebf 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-12.04 MAINTAINER info@webdevops.io 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/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/10-init.sh index fdffa2a0f..312fcd043 100644 --- a/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/10-init.sh +++ b/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/10-init.sh @@ -1 +1,8 @@ -# placeholder +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + sed -i "s/user[ ]*=.*/user = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" + sed -i "s/group[ ]*=.*/group = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" +fi diff --git a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 1c9599309..53ee9dfe1 100644 --- a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -63,7 +63,7 @@ owner: "root" group: "root" -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' @@ -72,13 +72,20 @@ - { key: 'listen', value: "0.0.0.0:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - - { key: 'access.log', value: "/docker.stdout" } - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.conf) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: ';{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'access.log', value: "/docker.stdout" } + - name: Disable clear env in php-fpm pool lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index 8fe99a8d4..99459ffaf 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-14.04 MAINTAINER info@webdevops.io 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/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/10-init.sh index fdffa2a0f..312fcd043 100644 --- a/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/10-init.sh +++ b/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/10-init.sh @@ -1 +1,8 @@ -# placeholder +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + sed -i "s/user[ ]*=.*/user = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" + sed -i "s/group[ ]*=.*/group = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" +fi diff --git a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 1c9599309..53ee9dfe1 100644 --- a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -63,7 +63,7 @@ owner: "root" group: "root" -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' @@ -72,13 +72,20 @@ - { key: 'listen', value: "0.0.0.0:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - - { key: 'access.log', value: "/docker.stdout" } - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.conf) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: ';{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'access.log', value: "/docker.stdout" } + - name: Disable clear env in php-fpm pool lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index 98aa7a03b..cd3852f10 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-15.04 MAINTAINER info@webdevops.io 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/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/10-init.sh index fdffa2a0f..312fcd043 100644 --- a/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/10-init.sh +++ b/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/10-init.sh @@ -1 +1,8 @@ -# placeholder +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + sed -i "s/user[ ]*=.*/user = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" + sed -i "s/group[ ]*=.*/group = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" +fi diff --git a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 1c9599309..53ee9dfe1 100644 --- a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -63,7 +63,7 @@ owner: "root" group: "root" -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' @@ -72,13 +72,20 @@ - { key: 'listen', value: "0.0.0.0:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - - { key: 'access.log', value: "/docker.stdout" } - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.conf) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: ';{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'access.log', value: "/docker.stdout" } + - name: Disable clear env in php-fpm pool lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index 7903cf5b6..35fe68852 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-15.10 MAINTAINER info@webdevops.io 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/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/10-init.sh index fdffa2a0f..312fcd043 100644 --- a/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/10-init.sh +++ b/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/10-init.sh @@ -1 +1,8 @@ -# placeholder +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + sed -i "s/user[ ]*=.*/user = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" + sed -i "s/group[ ]*=.*/group = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" +fi diff --git a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 1c9599309..53ee9dfe1 100644 --- a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -63,7 +63,7 @@ owner: "root" group: "root" -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' @@ -72,13 +72,20 @@ - { key: 'listen', value: "0.0.0.0:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - - { key: 'access.log', value: "/docker.stdout" } - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.conf) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: ';{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'access.log', value: "/docker.stdout" } + - name: Disable clear env in php-fpm pool lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index 18fda9c17..3a9bc6504 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-16.04 MAINTAINER info@webdevops.io 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/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/10-init.sh index fdffa2a0f..312fcd043 100644 --- a/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/10-init.sh +++ b/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/10-init.sh @@ -1 +1,8 @@ -# placeholder +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + sed -i "s/user[ ]*=.*/user = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" + sed -i "s/group[ ]*=.*/group = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" +fi diff --git a/docker/piwik/ubuntu-14.04/Dockerfile b/docker/piwik/ubuntu-14.04/Dockerfile index a1cd31f0c..8068793f4 100644 --- a/docker/piwik/ubuntu-14.04/Dockerfile +++ b/docker/piwik/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-nginx:ubuntu-14.04 MAINTAINER info@webdevops.io 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/piwik/ ENV PIWIK_URL http://example.com/ diff --git a/docker/postfix/latest/Dockerfile b/docker/postfix/latest/Dockerfile index 688ddfea4..77c2909f8 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 COPY conf/ /opt/docker/ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index c19e8ea32..a40b00d2a 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -8,7 +8,7 @@ FROM zendesk/samson:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 ############################################################################### @@ -54,6 +54,19 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && hash -r \ && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ + # Install gosu + && GOSU_VERSION=1.10 \ + && /usr/local/bin/apt-install wget gnupg dirmngr \ + && dpkgArch="amd64" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true \ + && apt-get purge -y -f --force-yes wget dirmngr \ # Cleanup && apt-get purge -y -f --force-yes \ python-dev \ @@ -84,6 +97,7 @@ RUN chmod +x /opt/docker/bin/* \ curl \ net-tools \ gnupg \ + && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/samson-deployment/latest/baselayout.tar b/docker/samson-deployment/latest/baselayout.tar index 59e4b1d50..8c249f50c 100644 Binary files a/docker/samson-deployment/latest/baselayout.tar and b/docker/samson-deployment/latest/baselayout.tar differ diff --git a/docker/samson-deployment/latest/conf/bin/entrypoint.sh b/docker/samson-deployment/latest/conf/bin/entrypoint.sh index 03730a757..bbabcdddb 100644 --- a/docker/samson-deployment/latest/conf/bin/entrypoint.sh +++ b/docker/samson-deployment/latest/conf/bin/entrypoint.sh @@ -1,10 +1,22 @@ #!/usr/bin/env bash +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + set -o pipefail # trace ERR through pipes set -o errtrace # trace ERR through 'time command' and other functions set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errexit ## set -e : exit the script if any statement returns a non-true return value +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /usr/local/bin/gosu + trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 0de978372..30be03c38 100644 --- a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -1,5 +1,6 @@ --- +- include: bootstrap/system.yml - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml new file mode 100644 index 000000000..0bcf102fe --- /dev/null +++ b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -0,0 +1,8 @@ +--- + +- name: Register logrotate configurations + file: + src: '/opt/docker/provision/entrypoint.d' + dest: '/entrypoint.d' + state: link + force: yes diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/build.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/build.yml index 8a56f9ba9..cd21505a4 100644 --- a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/build.yml +++ b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/build.yml @@ -1,3 +1,2 @@ --- -- include: bootstrap/logrotate.yml diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index ec3161801..736f55a35 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 RUN /usr/local/bin/apk-install \ # General sphinx diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index 4579a3975..5ce2208e3 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 RUN /opt/docker/bin/control.sh service.enable ssh diff --git a/docker/storage/latest/Dockerfile b/docker/storage/latest/Dockerfile index e362f1840..e63581812 100644 --- a/docker/storage/latest/Dockerfile +++ b/docker/storage/latest/Dockerfile @@ -8,7 +8,7 @@ FROM busybox:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 RUN mkdir /storage/ \ && chmod 777 /storage/ diff --git a/docker/typo3/ubuntu-14.04/Dockerfile b/docker/typo3/ubuntu-14.04/Dockerfile index a90853622..d7abc046b 100644 --- a/docker/typo3/ubuntu-14.04/Dockerfile +++ b/docker/typo3/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-apache:ubuntu-14.04 MAINTAINER info@webdevops.io 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/web/ diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index 10c25f1af..cdc7c33a2 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 ENV VARNISH_PORT 80 diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index 7a059a937..8d5c47122 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 ENV FTP_USER application ENV FTP_PASSWORD application diff --git a/documentation/docs/content/Customization/supervisord.rst b/documentation/docs/content/Customization/supervisord.rst index 41034830f..4be6eb9ce 100644 --- a/documentation/docs/content/Customization/supervisord.rst +++ b/documentation/docs/content/Customization/supervisord.rst @@ -26,7 +26,6 @@ Example configuration for hhvm:: command = /opt/docker/bin/service.d/hhvm.sh process_name=%(program_name)s directory = /var/run/hhvm/ - user = application startsecs = 0 autostart = true autorestart = true diff --git a/provisioning/base/general/bin/entrypoint.sh b/provisioning/base/general/bin/entrypoint.sh index 03730a757..bbabcdddb 100644 --- a/provisioning/base/general/bin/entrypoint.sh +++ b/provisioning/base/general/bin/entrypoint.sh @@ -1,10 +1,22 @@ #!/usr/bin/env bash +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + set -o pipefail # trace ERR through pipes set -o errtrace # trace ERR through 'time command' and other functions set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errexit ## set -e : exit the script if any statement returns a non-true return value +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /usr/local/bin/gosu + trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL diff --git a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap.yml b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap.yml index 0de978372..30be03c38 100644 --- a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -1,5 +1,6 @@ --- +- include: bootstrap/system.yml - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml diff --git a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/system.yml new file mode 100644 index 000000000..0bcf102fe --- /dev/null +++ b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -0,0 +1,8 @@ +--- + +- name: Register logrotate configurations + file: + src: '/opt/docker/provision/entrypoint.d' + dest: '/entrypoint.d' + state: link + force: yes diff --git a/provisioning/base/general/provision/roles/webdevops-base/tasks/build.yml b/provisioning/base/general/provision/roles/webdevops-base/tasks/build.yml index 8a56f9ba9..cd21505a4 100644 --- a/provisioning/base/general/provision/roles/webdevops-base/tasks/build.yml +++ b/provisioning/base/general/provision/roles/webdevops-base/tasks/build.yml @@ -1,3 +1,2 @@ --- -- include: bootstrap/logrotate.yml diff --git a/provisioning/hhvm/general/bin/service.d/hhvm.sh b/provisioning/hhvm/general/bin/service.d/hhvm.sh index ff0a26578..77d176cd7 100644 --- a/provisioning/hhvm/general/bin/service.d/hhvm.sh +++ b/provisioning/hhvm/general/bin/service.d/hhvm.sh @@ -4,4 +4,8 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/hhvm.d/" -exec /usr/bin/hhvm --mode server -vServer.Type=fastcgi -vServer.Port=9000 +if [[ -z "$CONTAINER_UID" ]]; then + CONTAINER_UID="application" +fi + +exec /usr/bin/hhvm --mode server -vServer.Type=fastcgi -vServer.Port=9000 --user "${CONTAINER_UID}" diff --git a/provisioning/hhvm/general/etc/supervisor.d/hhvm.conf b/provisioning/hhvm/general/etc/supervisor.d/hhvm.conf index 7a4fc0e29..44ddf7d35 100644 --- a/provisioning/hhvm/general/etc/supervisor.d/hhvm.conf +++ b/provisioning/hhvm/general/etc/supervisor.d/hhvm.conf @@ -6,7 +6,6 @@ priority=20 command = /opt/docker/bin/service.d/hhvm.sh process_name=%(program_name)s directory = /var/run/hhvm/ -user = application startsecs = 0 autostart = true autorestart = true diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index abf82d989..9455a78e2 100644 --- a/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -1,11 +1,12 @@ --- -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: + - { key: 'access.log', value: "/docker.stdout" } - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } - name: Open php-fpm for external connections (eg. debuggers) diff --git a/provisioning/php/general/bin/service.d/php-fpm.d/10-init.sh b/provisioning/php/general/bin/service.d/php-fpm.d/10-init.sh index fdffa2a0f..312fcd043 100644 --- a/provisioning/php/general/bin/service.d/php-fpm.d/10-init.sh +++ b/provisioning/php/general/bin/service.d/php-fpm.d/10-init.sh @@ -1 +1,8 @@ -# placeholder +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + sed -i "s/user[ ]*=.*/user = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" + sed -i "s/group[ ]*=.*/group = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" +fi diff --git a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 1c9599309..53ee9dfe1 100644 --- a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -63,7 +63,7 @@ owner: "root" group: "root" -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' @@ -72,13 +72,20 @@ - { key: 'listen', value: "0.0.0.0:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - - { key: 'access.log', value: "/docker.stdout" } - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.conf) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: ';{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'access.log', value: "/docker.stdout" } + - name: Disable clear env in php-fpm pool lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index be9b57223..7b74821f7 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -10,7 +10,7 @@ FROM {{ image }}:{{ tag }} MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.4 +LABEL io.webdevops.version=1.3.0 {%- endmacro %} {%- macro add(source, target) -%} diff --git a/template/Dockerfile/images/base.jinja2 b/template/Dockerfile/images/base.jinja2 index 00a91f0a5..1700c1ebd 100644 --- a/template/Dockerfile/images/base.jinja2 +++ b/template/Dockerfile/images/base.jinja2 @@ -11,6 +11,7 @@ RUN chmod +x /opt/docker/bin/* \ curl \ sed \ gnupg \ + && chmod +s /usr/local/bin/gosu \ {{ provision.runRoleInline('base', role) }} {%- endmacro %} @@ -27,6 +28,7 @@ RUN chmod +x /opt/docker/bin/* \ curl \ net-tools \ gnupg2 \ + && chmod +s /usr/local/bin/gosu \ {{ provision.runRoleInline('base', role) }} {%- endmacro %} @@ -44,6 +46,7 @@ RUN chmod +x /opt/docker/bin/* \ curl \ net-tools \ gnupg \ + && chmod +s /usr/local/bin/gosu \ {{ provision.runRoleInline('base', role) }} {%- endmacro %} @@ -61,5 +64,6 @@ RUN chmod +x /opt/docker/bin/* \ curl \ net-tools \ gnupg \ + && chmod +s /usr/local/bin/gosu \ {{ provision.runRoleInline('base', role) }} {%- endmacro %} diff --git a/template/Dockerfile/images/bootstrap.jinja2 b/template/Dockerfile/images/bootstrap.jinja2 index e81c7430d..687adddc6 100644 --- a/template/Dockerfile/images/bootstrap.jinja2 +++ b/template/Dockerfile/images/bootstrap.jinja2 @@ -29,6 +29,22 @@ RUN set -x \ && hash -r \ && pip install ansible \ && chmod 750 /usr/bin/ansible* \ + # Install gosu + && GOSU_VERSION=1.10 \ + && apk add --no-cache --virtual .gosu-deps \ + dpkg \ + gnupg \ + openssl \ + && dpkgArch="amd64" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true \ + && apk del .gosu-deps \ # Cleanup && apk del python-dev \ && find /var/log/ -mindepth 1 -delete @@ -61,6 +77,20 @@ RUN set -x \ && hash -r \ && pip install ansible \ && chmod 750 /usr/bin/ansible* \ + # Install gosu + && GOSU_VERSION=1.10 \ + && /usr/local/bin/yum-install gpg wget \ + && dpkgArch="amd64" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true \ + && yum erase -y wget \ + # Cleanup && yum erase -y python-devel \ && yum clean all \ && find /var/log/ -mindepth 1 -delete @@ -101,6 +131,19 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && hash -r \ && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ + # Install gosu + && GOSU_VERSION=1.10 \ + && /usr/local/bin/apt-install wget gnupg dirmngr \ + && dpkgArch="amd64" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true \ + && apt-get purge -y -f --force-yes wget dirmngr \ # Cleanup && apt-get purge -y -f --force-yes \ python-dev \ @@ -148,6 +191,19 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && hash -r \ && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ + # Install gosu + && GOSU_VERSION=1.10 \ + && /usr/local/bin/apt-install wget gnupg \ + && dpkgArch="amd64" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true \ + && apt-get purge -y -f --force-yes wget \ # Cleanup && apt-get purge -y -f --force-yes \ python-dev \ @@ -193,6 +249,19 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && hash -r \ && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ + # Install gosu + && GOSU_VERSION=1.10 \ + && /usr/local/bin/apt-install wget gnupg \ + && dpkgArch="amd64" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true \ + && apt-get purge -y -f --force-yes wget \ # Cleanup && apt-get purge -y -f --force-yes \ python-dev \ diff --git a/tests/serverspec/Gemfile b/tests/serverspec/Gemfile index 4f816a03e..ee6014844 100644 --- a/tests/serverspec/Gemfile +++ b/tests/serverspec/Gemfile @@ -2,6 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" gem 'rake' gem 'rspec-core' +gem 'rspec-retry' gem 'json' gem 'serverspec' gem 'docker-api' diff --git a/tests/serverspec/Gemfile.lock b/tests/serverspec/Gemfile.lock index 9eed3e6b4..b456ea773 100644 --- a/tests/serverspec/Gemfile.lock +++ b/tests/serverspec/Gemfile.lock @@ -28,6 +28,8 @@ GEM rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.5.0) + rspec-retry (0.5.3) + rspec-core (> 3.3, < 3.6) rspec-support (3.5.0) serverspec (2.37.2) multi_json @@ -49,6 +51,7 @@ DEPENDENCIES json rake rspec-core + rspec-retry serverspec BUNDLED WITH diff --git a/tests/serverspec/Rakefile b/tests/serverspec/Rakefile index 8daf626ae..296e546f9 100644 --- a/tests/serverspec/Rakefile +++ b/tests/serverspec/Rakefile @@ -1,6 +1,13 @@ require 'rake' require 'rspec/core/rake_task' +RSpec.configure do |config| + # show retry status in spec process + config.verbose_retry = true + # show exception that triggers a retry if verbose_retry is set to true + config.display_try_failure_messages = true +end + RSpec::Core::RakeTask.new(:"spec") do |t, args| #t.pattern = 'spec/base/*_spec.rb' end diff --git a/tests/serverspec/conf/app/php-test.php b/tests/serverspec/conf/app/php-test.php index ed3eb6b80..19d3b5a58 100644 --- a/tests/serverspec/conf/app/php-test.php +++ b/tests/serverspec/conf/app/php-test.php @@ -22,6 +22,10 @@ echo php_ini_scanned_files(); break; + case 'process_user_id': + echo 'UID:' . posix_getuid() . '#'; + break; + default: header('HTTP/1.1 500 Internal Server Error'); echo 'ERROR: Unknown test'; diff --git a/tests/serverspec/spec/collection/apache.rb b/tests/serverspec/spec/collection/apache.rb index b711c1cab..c98e9f822 100644 --- a/tests/serverspec/spec/collection/apache.rb +++ b/tests/serverspec/spec/collection/apache.rb @@ -8,8 +8,6 @@ include_examples 'apache::modules' include_examples 'apache::service::running' - wait_retry 30 do - include_examples 'web::test::pi' - end + include_examples 'web::test::pi' end diff --git a/tests/serverspec/spec/collection/hhvm.rb b/tests/serverspec/spec/collection/hhvm.rb index 5b79232d4..c3902748d 100644 --- a/tests/serverspec/spec/collection/hhvm.rb +++ b/tests/serverspec/spec/collection/hhvm.rb @@ -12,7 +12,5 @@ end shared_examples 'collection::hhvm::webserver-test' do - wait_retry 30 do - include_examples 'php::fpm::test::sha1' - end + include_examples 'php::fpm::test::sha1' end diff --git a/tests/serverspec/spec/collection/nginx.rb b/tests/serverspec/spec/collection/nginx.rb index dbaea159d..42a88d80d 100644 --- a/tests/serverspec/spec/collection/nginx.rb +++ b/tests/serverspec/spec/collection/nginx.rb @@ -7,8 +7,6 @@ # test after services are up include_examples 'nginx::service::running' - wait_retry 30 do - include_examples 'web::test::pi' - end + include_examples 'web::test::pi' end diff --git a/tests/serverspec/spec/collection/php-fpm5.rb b/tests/serverspec/spec/collection/php-fpm5.rb index 9ecc79934..e34de5c9e 100644 --- a/tests/serverspec/spec/collection/php-fpm5.rb +++ b/tests/serverspec/spec/collection/php-fpm5.rb @@ -21,26 +21,24 @@ shared_examples 'collection::php-fpm5::webserver-test::development' do - wait_retry 30 do - include_examples 'php-fpm::modules' - include_examples 'php-fpm5::modules' - include_examples 'php-fpm::modules::development' - include_examples 'php::fpm::test::sha1' - include_examples 'php::fpm::test::php_ini_scanned_files' - include_examples 'php::fpm::test::php_sapi_name' - include_examples 'php5::fpm::test::version' - end + include_examples 'php-fpm::modules' + include_examples 'php-fpm5::modules' + include_examples 'php-fpm::modules::development' + include_examples 'php::fpm::test::sha1' + include_examples 'php::fpm::test::php_ini_scanned_files' + include_examples 'php::fpm::test::php_sapi_name' + include_examples 'php::fpm::test::process_user_id' + include_examples 'php5::fpm::test::version' end shared_examples 'collection::php-fpm5::webserver-test::production' do - wait_retry 30 do - include_examples 'php-fpm::modules' - include_examples 'php-fpm5::modules' - include_examples 'php-fpm::modules::production' - include_examples 'php::fpm::test::sha1' - include_examples 'php::fpm::test::php_ini_scanned_files' - include_examples 'php::fpm::test::php_sapi_name' - include_examples 'php5::fpm::test::version' - end + include_examples 'php-fpm::modules' + include_examples 'php-fpm5::modules' + include_examples 'php-fpm::modules::production' + include_examples 'php::fpm::test::sha1' + include_examples 'php::fpm::test::php_ini_scanned_files' + include_examples 'php::fpm::test::php_sapi_name' + include_examples 'php::fpm::test::process_user_id' + include_examples 'php5::fpm::test::version' end diff --git a/tests/serverspec/spec/collection/php-fpm7.rb b/tests/serverspec/spec/collection/php-fpm7.rb index 3650c8866..6aeaae095 100644 --- a/tests/serverspec/spec/collection/php-fpm7.rb +++ b/tests/serverspec/spec/collection/php-fpm7.rb @@ -22,27 +22,25 @@ shared_examples 'collection::php-fpm7::webserver-test::development' do - wait_retry 30 do - include_examples 'php-fpm::modules' - include_examples 'php-fpm7::modules' - include_examples 'php-fpm::modules::development' - include_examples 'php::fpm::test::sha1' - include_examples 'php::fpm::test::php_ini_scanned_files' - include_examples 'php::fpm::test::php_sapi_name' - include_examples 'php7::fpm::test::version' - end + include_examples 'php-fpm::modules' + include_examples 'php-fpm7::modules' + include_examples 'php-fpm::modules::development' + include_examples 'php::fpm::test::sha1' + include_examples 'php::fpm::test::php_ini_scanned_files' + include_examples 'php::fpm::test::php_sapi_name' + include_examples 'php::fpm::test::process_user_id' + include_examples 'php7::fpm::test::version' end shared_examples 'collection::php-fpm7::webserver-test::production' do - wait_retry 30 do - include_examples 'php-fpm::modules' - include_examples 'php-fpm7::modules' - include_examples 'php-fpm::modules::production' - include_examples 'php::fpm::test::sha1' - include_examples 'php::fpm::test::php_ini_scanned_files' - include_examples 'php::fpm::test::php_sapi_name' - include_examples 'php7::fpm::test::version' - end + include_examples 'php-fpm::modules' + include_examples 'php-fpm7::modules' + include_examples 'php-fpm::modules::production' + include_examples 'php::fpm::test::sha1' + include_examples 'php::fpm::test::php_ini_scanned_files' + include_examples 'php::fpm::test::php_sapi_name' + include_examples 'php::fpm::test::process_user_id' + include_examples 'php7::fpm::test::version' end diff --git a/tests/serverspec/spec/docker/vsftp_spec.rb b/tests/serverspec/spec/docker/vsftp_spec.rb index 80e4e508d..49b443ad9 100644 --- a/tests/serverspec/spec/docker/vsftp_spec.rb +++ b/tests/serverspec/spec/docker/vsftp_spec.rb @@ -8,8 +8,8 @@ set :docker_image, @image.id end - include_examples 'collection::bootstrap' - include_examples 'collection::base' + #include_examples 'collection::bootstrap' + #include_examples 'collection::base' include_examples 'collection::vsftp' end diff --git a/tests/serverspec/spec/shared/apache/listening.rb b/tests/serverspec/spec/shared/apache/listening.rb index 45f701da5..64e765dc7 100644 --- a/tests/serverspec/spec/shared/apache/listening.rb +++ b/tests/serverspec/spec/shared/apache/listening.rb @@ -1,9 +1,7 @@ shared_examples 'apache::listening::public' do describe port(80) do - it "apache should be listening" do - wait_retry 30 do - should be_listening - end + it "apache should be listening", :retry => 20, :retry_wait => 3 do + should be_listening end end end diff --git a/tests/serverspec/spec/shared/apache/service.rb b/tests/serverspec/spec/shared/apache/service.rb index a072e89a9..fc9ed16a2 100644 --- a/tests/serverspec/spec/shared/apache/service.rb +++ b/tests/serverspec/spec/shared/apache/service.rb @@ -1,4 +1,12 @@ shared_examples 'apache::service::running' do + describe "service apache check" do + it "should have running apache daemon", :retry => 20, :retry_wait => 3 do + cmd = command("service apache check") + expect(cmd.stdout).to match('ok') + expect(cmd.exit_status).to eq 0 + end + end + describe command('service apache pid | tr -d \'\n\'') do # must not pid 0 its(:stdout) { should_not match %r!^0$! } diff --git a/tests/serverspec/spec/shared/dovecot/listening.rb b/tests/serverspec/spec/shared/dovecot/listening.rb index 3f504a5a5..42d74b396 100644 --- a/tests/serverspec/spec/shared/dovecot/listening.rb +++ b/tests/serverspec/spec/shared/dovecot/listening.rb @@ -1,9 +1,7 @@ shared_examples 'dovecot::listening::public' do describe port(143) do - it "dovecot should be listening" do - wait_retry 30 do - should be_listening - end + it "dovecot should be listening", :retry => 20, :retry_wait => 3 do + should be_listening end end end diff --git a/tests/serverspec/spec/shared/dovecot/service.rb b/tests/serverspec/spec/shared/dovecot/service.rb index 0412423f4..bf245ecbf 100644 --- a/tests/serverspec/spec/shared/dovecot/service.rb +++ b/tests/serverspec/spec/shared/dovecot/service.rb @@ -1,4 +1,12 @@ shared_examples 'dovecot::service::running' do + describe "service dovecot check" do + it "should have running dovecot daemon", :retry => 20, :retry_wait => 3 do + cmd = command("service dovecot check") + expect(cmd.stdout).to match('ok') + expect(cmd.exit_status).to eq 0 + end + end + describe command('service dovecot pid | tr -d \'\n\'') do # must not pid 0 its(:stdout) { should_not match %r!^0$! } diff --git a/tests/serverspec/spec/shared/hhvm/listening.rb b/tests/serverspec/spec/shared/hhvm/listening.rb index 50bce89a5..6d7c204b1 100644 --- a/tests/serverspec/spec/shared/hhvm/listening.rb +++ b/tests/serverspec/spec/shared/hhvm/listening.rb @@ -1,27 +1,21 @@ shared_examples 'hhvm::listening::public' do describe port(9000) do - it "hhvm should be listening" do - wait_retry 15 do - should be_listening.with('tcp6') - end + it "hhvm should be listening", :retry => 20, :retry_wait => 3 do + should be_listening.with('tcp6') end end end shared_examples 'hhvm::listening::local-only' do describe port(9000) do - it "hhvm should NOT be listening public" do - wait_retry 15 do - should_not be_listening - end + it "hhvm should NOT be listening public", :retry => 20, :retry_wait => 3 do + should_not be_listening end end describe port(9000) do - it "hhvm should be listening local" do - wait_retry 15 do - should be_listening.on('::1').with('tcp6') - end + it "hhvm should be listening local", :retry => 20, :retry_wait => 3 do + should be_listening.on('::1').with('tcp6') end end end diff --git a/tests/serverspec/spec/shared/hhvm/service.rb b/tests/serverspec/spec/shared/hhvm/service.rb index 9a3a78125..89026b789 100644 --- a/tests/serverspec/spec/shared/hhvm/service.rb +++ b/tests/serverspec/spec/shared/hhvm/service.rb @@ -1,4 +1,12 @@ shared_examples 'hhvm::service::running' do + describe "service hhvm check" do + it "should have running hhvm daemon", :retry => 20, :retry_wait => 3 do + cmd = command("service hhvm check") + expect(cmd.stdout).to match('ok') + expect(cmd.exit_status).to eq 0 + end + end + describe command('service hhvm pid | tr -d \'\n\'') do # must not pid 0 its(:stdout) { should_not match %r!^0$! } diff --git a/tests/serverspec/spec/shared/nginx/listening.rb b/tests/serverspec/spec/shared/nginx/listening.rb index 8cb9dbf9f..b52065a11 100644 --- a/tests/serverspec/spec/shared/nginx/listening.rb +++ b/tests/serverspec/spec/shared/nginx/listening.rb @@ -1,9 +1,7 @@ shared_examples 'nginx::listening::public' do describe port(80) do - it "nginx should be listening" do - wait_retry 30 do - should be_listening - end + it "nginx should be listening", :retry => 20, :retry_wait => 3 do + should be_listening end end end diff --git a/tests/serverspec/spec/shared/nginx/service.rb b/tests/serverspec/spec/shared/nginx/service.rb index 9353d6910..cd6598f42 100644 --- a/tests/serverspec/spec/shared/nginx/service.rb +++ b/tests/serverspec/spec/shared/nginx/service.rb @@ -1,4 +1,12 @@ shared_examples 'nginx::service::running' do + describe "service nginx check" do + it "should have running nginx daemon", :retry => 20, :retry_wait => 3 do + cmd = command("service nginx check") + expect(cmd.stdout).to match('ok') + expect(cmd.exit_status).to eq 0 + end + end + describe command('service nginx pid | tr -d \'\n\'') do # must not pid 0 its(:stdout) { should_not match %r!^0$! } diff --git a/tests/serverspec/spec/shared/php/fpm.rb b/tests/serverspec/spec/shared/php/fpm.rb index f433f0d17..fe59b23f8 100644 --- a/tests/serverspec/spec/shared/php/fpm.rb +++ b/tests/serverspec/spec/shared/php/fpm.rb @@ -33,28 +33,22 @@ shared_examples 'php-fpm::listening::public' do describe port(9000) do - it "php-fpm should be listening" do - wait_retry 30 do - should be_listening.on('0.0.0.0').with('tcp') - end + it "php-fpm should be listening", :retry => 20, :retry_wait => 3 do + should be_listening.on('0.0.0.0').with('tcp') end end end shared_examples 'php-fpm::listening::local-only' do describe port(9000) do - it "php-fpm should NOT be listening public" do - wait_retry 15 do - should_not be_listening.on('0.0.0.0') - end + it "php-fpm should NOT be listening public", :retry => 20, :retry_wait => 3 do + should_not be_listening.on('0.0.0.0') end end describe port(9000) do - it "php-fpm should be listening local" do - wait_retry 30 do - should be_listening.on('127.0.0.1').with('tcp') - end + it "php-fpm should be listening local", :retry => 20, :retry_wait => 3 do + should be_listening.on('127.0.0.1').with('tcp') end end end diff --git a/tests/serverspec/spec/shared/php/service.rb b/tests/serverspec/spec/shared/php/service.rb index 8e677f93e..920500698 100644 --- a/tests/serverspec/spec/shared/php/service.rb +++ b/tests/serverspec/spec/shared/php/service.rb @@ -1,4 +1,12 @@ shared_examples 'php-fpm::service::running' do + describe "service php-fpm check" do + it "should have running php-fpm daemon", :retry => 20, :retry_wait => 3 do + cmd = command("service php-fpm check") + expect(cmd.stdout).to match('ok') + expect(cmd.exit_status).to eq 0 + end + end + describe command('service php-fpm pid | tr -d \'\n\'') do # must not pid 0 its(:stdout) { should_not match %r!^0$! } diff --git a/tests/serverspec/spec/shared/php/test.rb b/tests/serverspec/spec/shared/php/test.rb index 48c41479d..4d1f2304f 100644 --- a/tests/serverspec/spec/shared/php/test.rb +++ b/tests/serverspec/spec/shared/php/test.rb @@ -35,17 +35,17 @@ 'http://localhost/php-test.php?test=sha1', 'https://localhost/php-test.php?test=sha1' ].each do |url| - describe command("curl --insecure --silent --retry 10 --fail #{url}") do - its(:stdout) { should_not contain('PHP Notice') } - its(:stdout) { should_not contain('Notice') } - its(:stdout) { should_not contain('PHP Warning') } - its(:stderr) { should_not contain('PHP Notice') } - its(:stderr) { should_not contain('Notice') } - its(:stderr) { should_not contain('PHP Warning') } - - its(:stdout) { should contain('2ae62521966cf6d4188acefc943c903e5fc0a25c') } - - its(:exit_status) { should eq 0 } + describe url do + it "should have running and answering webserver", :retry => 20, :retry_wait => 3 do + cmd = command("curl --insecure --silent --retry 10 --fail #{url}") + expect(cmd.stdout).not_to contain('PHP Notice') + expect(cmd.stdout).not_to contain('Notice') + expect(cmd.stdout).not_to contain('PHP Warning') + expect(cmd.stdout).not_to contain('Warning') + expect(cmd.stdout).not_to contain('Fatal Error') + expect(cmd.stdout).to contain('2ae62521966cf6d4188acefc943c903e5fc0a25c') + expect(cmd.exit_status).to eq 0 + end end end end @@ -55,17 +55,17 @@ 'http://localhost/php-test.php?test=php_sapi_name', 'https://localhost/php-test.php?test=php_sapi_name' ].each do |url| - describe command("curl --insecure --silent --retry 10 --fail #{url}") do - its(:stdout) { should_not contain('PHP Notice') } - its(:stdout) { should_not contain('Notice') } - its(:stdout) { should_not contain('PHP Warning') } - its(:stderr) { should_not contain('PHP Notice') } - its(:stderr) { should_not contain('Notice') } - its(:stderr) { should_not contain('PHP Warning') } - - its(:stdout) { should contain('fpm-fcgi') } - - its(:exit_status) { should eq 0 } + describe url do + it "should have running and answering webserver", :retry => 20, :retry_wait => 3 do + cmd = command("curl --insecure --silent --retry 10 --fail #{url}") + expect(cmd.stdout).not_to contain('PHP Notice') + expect(cmd.stdout).not_to contain('Notice') + expect(cmd.stdout).not_to contain('PHP Warning') + expect(cmd.stdout).not_to contain('Warning') + expect(cmd.stdout).not_to contain('Fatal Error') + expect(cmd.stdout).to contain('fpm-fcgi') + expect(cmd.exit_status).to eq 0 + end end end end @@ -76,17 +76,18 @@ 'http://localhost/php-test.php?test=php_ini_scanned_files', 'https://localhost/php-test.php?test=php_ini_scanned_files' ].each do |url| - describe command("curl --insecure --silent --retry 10 --fail #{url}") do - its(:stdout) { should_not contain('PHP Notice') } - its(:stdout) { should_not contain('Notice') } - its(:stdout) { should_not contain('PHP Warning') } - its(:stderr) { should_not contain('PHP Notice') } - its(:stderr) { should_not contain('Notice') } - its(:stderr) { should_not contain('PHP Warning') } - its(:stdout) { should contain('-docker.ini') } - its(:stdout) { should contain('-webdevops.ini') } - - its(:exit_status) { should eq 0 } + describe url do + it "should have running and answering webserver", :retry => 20, :retry_wait => 3 do + cmd = command("curl --insecure --silent --retry 10 --fail #{url}") + expect(cmd.stdout).not_to contain('PHP Notice') + expect(cmd.stdout).not_to contain('Notice') + expect(cmd.stdout).not_to contain('PHP Warning') + expect(cmd.stdout).not_to contain('Warning') + expect(cmd.stdout).not_to contain('Fatal Error') + expect(cmd.stdout).to contain('-docker.ini') + expect(cmd.stdout).to contain('-webdevops.ini') + expect(cmd.exit_status).to eq 0 + end end end end @@ -96,17 +97,17 @@ 'http://localhost/php-test.php?test=version', 'https://localhost/php-test.php?test=version' ].each do |url| - describe command("curl --insecure --silent --retry 10 --fail #{url}") do - its(:stdout) { should_not contain('PHP Notice') } - its(:stdout) { should_not contain('Notice') } - its(:stdout) { should_not contain('PHP Warning') } - its(:stderr) { should_not contain('PHP Notice') } - its(:stderr) { should_not contain('Notice') } - its(:stderr) { should_not contain('PHP Warning') } - - its(:stdout) { should match %r!PHP 5\.[3-9]\.[0-9]{1,2}(-[^\(]*)?! } - - its(:exit_status) { should eq 0 } + describe url do + it "should have running and answering webserver", :retry => 20, :retry_wait => 3 do + cmd = command("curl --insecure --silent --retry 10 --fail #{url}") + expect(cmd.stdout).not_to contain('PHP Notice') + expect(cmd.stdout).not_to contain('Notice') + expect(cmd.stdout).not_to contain('PHP Warning') + expect(cmd.stdout).not_to contain('Warning') + expect(cmd.stdout).not_to contain('Fatal Error') + expect(cmd.stdout).to match %r!PHP 5\.[3-9]\.[0-9]{1,2}(-[^\(]*)?! + expect(cmd.exit_status).to eq 0 + end end end end @@ -116,17 +117,37 @@ 'http://localhost/php-test.php?test=version', 'https://localhost/php-test.php?test=version' ].each do |url| - describe command("curl --insecure --silent --retry 10 --fail #{url}") do - its(:stdout) { should_not contain('PHP Notice') } - its(:stdout) { should_not contain('Notice') } - its(:stdout) { should_not contain('PHP Warning') } - its(:stderr) { should_not contain('PHP Notice') } - its(:stderr) { should_not contain('Notice') } - its(:stderr) { should_not contain('PHP Warning') } - - its(:stdout) { should match %r!PHP 7\.[0-9]\.[0-9]{1,2}(-[^\(]*)?! } + describe url do + it "should have running and answering webserver", :retry => 20, :retry_wait => 3 do + cmd = command("curl --insecure --silent --retry 10 --fail #{url}") + expect(cmd.stdout).not_to contain('PHP Notice') + expect(cmd.stdout).not_to contain('Notice') + expect(cmd.stdout).not_to contain('PHP Warning') + expect(cmd.stdout).not_to contain('Warning') + expect(cmd.stdout).not_to contain('Fatal Error') + expect(cmd.stdout).to match %r!PHP 7\.[0-9]\.[0-9]{1,2}(-[^\(]*)?! + expect(cmd.exit_status).to eq 0 + end + end + end +end - its(:exit_status) { should eq 0 } +shared_examples 'php::fpm::test::process_user_id' do + [ + 'http://localhost/php-test.php?test=process_user_id', + 'https://localhost/php-test.php?test=process_user_id' + ].each do |url| + describe url do + it "should have running and answering webserver", :retry => 20, :retry_wait => 3 do + cmd = command("curl --insecure --silent --retry 10 --fail #{url}") + expect(cmd.stdout).not_to contain('PHP Notice') + expect(cmd.stdout).not_to contain('Notice') + expect(cmd.stdout).not_to contain('PHP Warning') + expect(cmd.stdout).not_to contain('Warning') + expect(cmd.stdout).not_to contain('Fatal Error') + expect(cmd.stdout).to contain('UID:1000#') + expect(cmd.exit_status).to eq 0 + end end end end diff --git a/tests/serverspec/spec/shared/postfix/listening.rb b/tests/serverspec/spec/shared/postfix/listening.rb index 48b69c56c..2bfb1881d 100644 --- a/tests/serverspec/spec/shared/postfix/listening.rb +++ b/tests/serverspec/spec/shared/postfix/listening.rb @@ -1,9 +1,7 @@ shared_examples 'postfix::listening::public' do describe port(25) do - it "postfix should be listening" do - wait_retry 30 do - should be_listening - end + it "postfix should be listening", :retry => 20, :retry_wait => 3 do + should be_listening end end end diff --git a/tests/serverspec/spec/shared/postfix/service.rb b/tests/serverspec/spec/shared/postfix/service.rb index 74e8dfffd..1e85d99b9 100644 --- a/tests/serverspec/spec/shared/postfix/service.rb +++ b/tests/serverspec/spec/shared/postfix/service.rb @@ -1,4 +1,12 @@ shared_examples 'postfix::service::running' do + describe "service postfix check" do + it "should have running postfix daemon", :retry => 20, :retry_wait => 3 do + cmd = command("service postfix check") + expect(cmd.stdout).to match('ok') + expect(cmd.exit_status).to eq 0 + end + end + describe command('service postfix pid | tr -d \'\n\'') do # must not pid 0 its(:stdout) { should_not match %r!^0$! } diff --git a/tests/serverspec/spec/shared/samson-deployment/listening.rb b/tests/serverspec/spec/shared/samson-deployment/listening.rb index 9e5ce978a..45cd83c5c 100644 --- a/tests/serverspec/spec/shared/samson-deployment/listening.rb +++ b/tests/serverspec/spec/shared/samson-deployment/listening.rb @@ -1,18 +1,14 @@ shared_examples 'samson-deployment::listening::public' do describe port(80) do - it "samson (nginx reverse proxy) should be listening" do - wait_retry 30 do - should be_listening - end + it "samson (nginx reverse proxy) should be listening", :retry => 20, :retry_wait => 3 do + should be_listening end end # will not start because github api keys are needed # describe port(9000) do -# it "samson should be listening" do -# wait_retry 30 do -# should be_listening -# end +# it "samson should be listening", :retry => 20, :retry_wait => 3 do +# should be_listening # end # end end diff --git a/tests/serverspec/spec/shared/ssh/listening.rb b/tests/serverspec/spec/shared/ssh/listening.rb index 588b46059..dc0e947c9 100644 --- a/tests/serverspec/spec/shared/ssh/listening.rb +++ b/tests/serverspec/spec/shared/ssh/listening.rb @@ -1,9 +1,7 @@ shared_examples 'ssh::listening::public' do describe port(22) do - it "ssh should be listening" do - wait_retry 30 do - should be_listening - end + it "ssh should be listening", :retry => 20, :retry_wait => 3 do + should be_listening end end end diff --git a/tests/serverspec/spec/shared/ssh/service.rb b/tests/serverspec/spec/shared/ssh/service.rb index 80b5eec90..2715942f1 100644 --- a/tests/serverspec/spec/shared/ssh/service.rb +++ b/tests/serverspec/spec/shared/ssh/service.rb @@ -1,4 +1,12 @@ shared_examples 'ssh::service::running' do + describe "service ssh check" do + it "should have running ssh daemon", :retry => 20, :retry_wait => 3 do + cmd = command("service ssh check") + expect(cmd.stdout).to match('ok') + expect(cmd.exit_status).to eq 0 + end + end + describe command('service ssh pid | tr -d \'\n\'') do # must not pid 0 its(:stdout) { should_not match %r!^0$! } diff --git a/tests/serverspec/spec/shared/varnish/listening.rb b/tests/serverspec/spec/shared/varnish/listening.rb index ab4ca16b7..87de3197e 100644 --- a/tests/serverspec/spec/shared/varnish/listening.rb +++ b/tests/serverspec/spec/shared/varnish/listening.rb @@ -1,9 +1,7 @@ shared_examples 'varnish::listening::public' do describe port(80) do - it "varnish should be listening" do - wait_retry 30 do - should be_listening - end + it "varnish should be listening", :retry => 20, :retry_wait => 3 do + should be_listening end end end diff --git a/tests/serverspec/spec/shared/vsftp/listening.rb b/tests/serverspec/spec/shared/vsftp/listening.rb index 4483c02ab..7d3227043 100644 --- a/tests/serverspec/spec/shared/vsftp/listening.rb +++ b/tests/serverspec/spec/shared/vsftp/listening.rb @@ -1,9 +1,7 @@ shared_examples 'vsftp::listening::public' do describe port(21) do - it "vsftp should be listening" do - wait_retry 30 do - should be_listening - end + it "should listen to port 21", :retry => 20, :retry_wait => 3 do + should be_listening end end end diff --git a/tests/serverspec/spec/shared/vsftp/service.rb b/tests/serverspec/spec/shared/vsftp/service.rb index ae8825fc0..e19a13863 100644 --- a/tests/serverspec/spec/shared/vsftp/service.rb +++ b/tests/serverspec/spec/shared/vsftp/service.rb @@ -1,4 +1,12 @@ shared_examples 'vsftp::service::running' do + describe "service vsftp check" do + it "should have running vsftp daemon", :retry => 20, :retry_wait => 3 do + cmd = command("service vsftp check") + expect(cmd.stdout).to match('ok') + expect(cmd.exit_status).to eq 0 + end + end + describe command('service vsftp pid | tr -d \'\n\'') do # must not pid 0 its(:stdout) { should_not match %r!^0$! } diff --git a/tests/serverspec/spec/shared/web/test.rb b/tests/serverspec/spec/shared/web/test.rb index d7603f636..1a45bef27 100644 --- a/tests/serverspec/spec/shared/web/test.rb +++ b/tests/serverspec/spec/shared/web/test.rb @@ -3,10 +3,12 @@ 'http://localhost/pi-number.html', 'https://localhost/pi-number.html' ].each do |url| - describe command("curl --insecure --silent --retry 10 --fail #{url}") do - its(:stdout) { should contain('3.14159265359') } - - its(:exit_status) { should eq 0 } + describe url do + it "should have running and answering webserver", :retry => 20, :retry_wait => 3 do + cmd = command("curl --insecure --silent --retry 10 --fail #{url}") + expect(cmd.stdout).to contain('3.14159265359') + expect(cmd.exit_status).to eq 0 + end end end end diff --git a/tests/serverspec/spec/spec_helper.rb b/tests/serverspec/spec/spec_helper.rb index c7a46876c..2110ab12b 100644 --- a/tests/serverspec/spec/spec_helper.rb +++ b/tests/serverspec/spec/spec_helper.rb @@ -1,4 +1,5 @@ require 'serverspec' +require 'rspec/retry' base_spec_dir = Pathname.new(File.join(File.dirname(__FILE__)))