diff --git a/Makefile b/Makefile index 7ae881d7e..70205f88c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ARGS = $(filter-out $@,$(MAKECMDGOALS)) MAKEFLAGS += --silent -.PHONY: test documentation +.PHONY: test documentation baselayout provision DOCKER_REPOSITORY=`cat DOCKER_REPOSITORY` DOCKER_TAG_LATEST=`cat DOCKER_TAG_LATEST` @@ -31,9 +31,12 @@ test: test-hub-images: DOCKER_PULL=1 make test +baselayout: + BASELAYOUT=1 PROVISION=0 bash bin/provision.sh + provision: python bin/buildDockerfile.py --template=template/ --dockerfile=docker/ - bash bin/provision.sh + BASELAYOUT=0 PROVISION=1 bash bin/provision.sh publish: dist-update rebuild test push diff --git a/README.md b/README.md index bafb7547f..6949daf21 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ Command | Description `DEBUG=1 make all` | Show log of build process even if process is successfull `FORCE=1 make all` | Force container build (`docker build --no-cache ...`)
| +`make baselayout` | Build and deploy baselayout.tar `make provision` | Deploy all configuration files from [_provisioning/](_provisioning/README.md) `make dist-update` | Update local distrubtion images (CentOS, Debian, Ubuntu)
| diff --git a/bin/provision.sh b/bin/provision.sh index 3087a2afb..ef6625ed2 100755 --- a/bin/provision.sh +++ b/bin/provision.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -if [ -n "$1" ]; then +if [[ -n "$1" ]]; then BUILD_TARGET="$1" else BUILD_TARGET="all" @@ -11,6 +11,17 @@ if [[ "$BUILD_MODE" == "push" ]]; then exit 0 fi +if [[ "$BASELAYOUT" -eq 1 ]]; then + BASELAYOUT=1 +else + BASELAYOUT=0 +fi + +if [[ "$PROVISION" -eq 1 ]]; then + PROVISION=1 +else + PROVISION=0 +fi set -o pipefail # trace ERR through pipes set -o errtrace # trace ERR through 'time command' and other functions @@ -105,11 +116,13 @@ function listDirectoriesWithFilter() { # ## function buildBaselayout() { - echo " * Building localscripts" + if [[ "$BASELAYOUT" -eq 1 ]]; then + echo " * Building localscripts" - cd "${BASELAYOUT_DIR}" - rm -f baselayout.tar - $TAR -jc --owner=0 --group=0 -f baselayout.tar * + cd "${BASELAYOUT_DIR}" + rm -f baselayout.tar + $TAR -jc --owner=0 --group=0 -f baselayout.tar * + fi } ### @@ -119,15 +132,17 @@ function buildBaselayout() { # ## function deployBaselayout() { - DOCKER_CONTAINER="$1" - DOCKER_FILTER="$2" - - listDirectoriesWithFilter "${DOCKER_DIR}/${DOCKER_CONTAINER}" "${DOCKER_FILTER}" | while read DOCKER_DIR; do - if [ -f "${DOCKER_DIR}/Dockerfile" ]; then - echo " - $(relativeDir $DOCKER_DIR)" - cp baselayout.tar "${DOCKER_DIR}/baselayout.tar" - fi - done + if [[ "$BASELAYOUT" -eq 1 ]]; then + DOCKER_CONTAINER="$1" + DOCKER_FILTER="$2" + + listDirectoriesWithFilter "${DOCKER_DIR}/${DOCKER_CONTAINER}" "${DOCKER_FILTER}" | while read DOCKER_DIR; do + if [ -f "${DOCKER_DIR}/Dockerfile" ]; then + echo " - $(relativeDir $DOCKER_DIR)" + cp baselayout.tar "${DOCKER_DIR}/baselayout.tar" + fi + done + fi } ####################################### @@ -144,16 +159,18 @@ function deployBaselayout() { # ## function clearConfiguration() { - DOCKER_CONTAINER="$1" - DOCKER_FILTER="$2" - - echo " -> Clearing configuration" - listDirectoriesWithFilter "${DOCKER_DIR}/${DOCKER_CONTAINER}" "${DOCKER_FILTER}" | while read DOCKER_DIR; do - if [ -f "${DOCKER_DIR}/Dockerfile" ]; then - echo " - $(relativeDir $DOCKER_DIR)" - rm -rf "${DOCKER_DIR}/conf/" - fi - done + if [[ "$PROVISION" -eq 1 ]]; then + DOCKER_CONTAINER="$1" + DOCKER_FILTER="$2" + + echo " -> Clearing configuration" + listDirectoriesWithFilter "${DOCKER_DIR}/${DOCKER_CONTAINER}" "${DOCKER_FILTER}" | while read DOCKER_DIR; do + if [ -f "${DOCKER_DIR}/Dockerfile" ]; then + echo " - $(relativeDir $DOCKER_DIR)" + rm -rf "${DOCKER_DIR}/conf/" + fi + done + fi } ### @@ -167,22 +184,24 @@ function clearConfiguration() { # ## function deployConfiguration() { - PROVISION_SUB_DIR="$1" - DOCKER_CONTAINER="$2" - DOCKER_FILTER="$3" - - if [ "$DOCKER_FILTER" == "*" ]; then - echo " -> Deploying configuration" - else - echo " -> Deploying configuration with filter '$DOCKER_FILTER'" - fi - - listDirectoriesWithFilter "${DOCKER_DIR}/${DOCKER_CONTAINER}" "${DOCKER_FILTER}" | while read DOCKER_DIR; do - if [ -f "${DOCKER_DIR}/Dockerfile" ]; then - echo " - $(relativeDir $DOCKER_DIR)" - cp -f -r "${PROVISION_DIR}/${PROVISION_SUB_DIR}/." "${DOCKER_DIR}/conf/" + if [[ "$PROVISION" -eq 1 ]]; then + PROVISION_SUB_DIR="$1" + DOCKER_CONTAINER="$2" + DOCKER_FILTER="$3" + + if [ "$DOCKER_FILTER" == "*" ]; then + echo " -> Deploying configuration" + else + echo " -> Deploying configuration with filter '$DOCKER_FILTER'" fi - done + + listDirectoriesWithFilter "${DOCKER_DIR}/${DOCKER_CONTAINER}" "${DOCKER_FILTER}" | while read DOCKER_DIR; do + if [ -f "${DOCKER_DIR}/Dockerfile" ]; then + echo " - $(relativeDir $DOCKER_DIR)" + cp -f -r "${PROVISION_DIR}/${PROVISION_SUB_DIR}/." "${DOCKER_DIR}/conf/" + fi + done + fi } ### diff --git a/docker/ansible/alpine-3/Dockerfile b/docker/ansible/alpine-3/Dockerfile index fdb70b3c8..0e1469eb9 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index 3e2bb1076..50c7e4081 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index 5a0b2d9c6..70f2f04a4 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index 156dc58dd..e1efa7dfe 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index 70211eadb..ed4ed9f12 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index 438d230b9..99eef22c6 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index 8934057b8..bd1778b0f 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index c7e08c8b6..326ede095 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index 67a642bfb..03ef6de10 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index 56f0c1c8a..2f89bb75f 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 diff --git a/docker/apache/alpine-3/Dockerfile b/docker/apache/alpine-3/Dockerfile index f1fead3ef..124560c1a 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/alpine-3/Dockerfile.jinja2 b/docker/apache/alpine-3/Dockerfile.jinja2 index 76afec2ff..ea3af4101 100644 --- a/docker/apache/alpine-3/Dockerfile.jinja2 +++ b/docker/apache/alpine-3/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/apache/alpine-3/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/alpine-3/conf/etc/httpd/conf.d/10-php.conf index b017879ad..b91e36bb9 100644 --- a/docker/apache/alpine-3/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/apache/alpine-3/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ - +> ProxySet connectiontimeout=5 timeout=600 - SetHandler "proxy:fcgi://127.0.0.1:9000" + SetHandler "proxy:fcgi://" diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index 6d3a667b1..82381d5f6 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/centos-7/Dockerfile.jinja2 b/docker/apache/centos-7/Dockerfile.jinja2 index c5ad33c29..f70a561ef 100644 --- a/docker/apache/centos-7/Dockerfile.jinja2 +++ b/docker/apache/centos-7/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/apache/centos-7/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/centos-7/conf/etc/httpd/conf.d/10-php.conf index b017879ad..b91e36bb9 100644 --- a/docker/apache/centos-7/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/apache/centos-7/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ - +> ProxySet connectiontimeout=5 timeout=600 - SetHandler "proxy:fcgi://127.0.0.1:9000" + SetHandler "proxy:fcgi://" diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index 9af5f7d78..4706001f1 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/debian-7/Dockerfile.jinja2 b/docker/apache/debian-7/Dockerfile.jinja2 index e9d9e4c20..ab37880ea 100644 --- a/docker/apache/debian-7/Dockerfile.jinja2 +++ b/docker/apache/debian-7/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/apache/debian-7/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/debian-7/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/apache/debian-7/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/apache/debian-7/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index 2f08dc1be..06bec9ef6 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/debian-8/Dockerfile.jinja2 b/docker/apache/debian-8/Dockerfile.jinja2 index 96e3005da..0f0452e09 100644 --- a/docker/apache/debian-8/Dockerfile.jinja2 +++ b/docker/apache/debian-8/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/apache/debian-8/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/debian-8/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/apache/debian-8/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/apache/debian-8/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index cba423f66..ccdd7b566 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/debian-9/Dockerfile.jinja2 b/docker/apache/debian-9/Dockerfile.jinja2 index 7f5b6faa9..768a16da4 100644 --- a/docker/apache/debian-9/Dockerfile.jinja2 +++ b/docker/apache/debian-9/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/apache/debian-9/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/debian-9/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/apache/debian-9/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/apache/debian-9/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index 9a87f5f2e..afcf0ff6c 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-12.04/Dockerfile.jinja2 b/docker/apache/ubuntu-12.04/Dockerfile.jinja2 index d64973331..02866dc2d 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-12.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index 667ebc000..1c55102f2 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-14.04/Dockerfile.jinja2 b/docker/apache/ubuntu-14.04/Dockerfile.jinja2 index 88187eebb..d72bf7c01 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-14.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index ab87b6522..cbc0a9c8c 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-15.04/Dockerfile.jinja2 b/docker/apache/ubuntu-15.04/Dockerfile.jinja2 index 083111429..600c3a135 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-15.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index 9a08a41ba..4e72c88b9 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-15.10/Dockerfile.jinja2 b/docker/apache/ubuntu-15.10/Dockerfile.jinja2 index 499d1c386..6b77e572c 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-15.10/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index 2ae2292a6..8311605bf 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-16.04/Dockerfile.jinja2 b/docker/apache/ubuntu-16.04/Dockerfile.jinja2 index 1c6548975..45da1db24 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-16.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/base-app/alpine-3/Dockerfile b/docker/base-app/alpine-3/Dockerfile index 78e15dadb..9b17d5e8e 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/alpine-3/Dockerfile.jinja2 b/docker/base-app/alpine-3/Dockerfile.jinja2 index 36a66d3a6..07b2464e3 100644 --- a/docker/base-app/alpine-3/Dockerfile.jinja2 +++ b/docker/base-app/alpine-3/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentApp() }} +{{ environment.app() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index fcf5d16a2..1bafe6b71 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/centos-7/Dockerfile.jinja2 b/docker/base-app/centos-7/Dockerfile.jinja2 index 41676309b..8dc4762a5 100644 --- a/docker/base-app/centos-7/Dockerfile.jinja2 +++ b/docker/base-app/centos-7/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentApp() }} +{{ environment.app() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index 06b07cd69..1807008c9 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/debian-7/Dockerfile.jinja2 b/docker/base-app/debian-7/Dockerfile.jinja2 index 333294484..495bfb1de 100644 --- a/docker/base-app/debian-7/Dockerfile.jinja2 +++ b/docker/base-app/debian-7/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentApp() }} +{{ environment.app() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index 073d1940a..d7f949ba7 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/debian-8/Dockerfile.jinja2 b/docker/base-app/debian-8/Dockerfile.jinja2 index 8aa108a4c..913957eab 100644 --- a/docker/base-app/debian-8/Dockerfile.jinja2 +++ b/docker/base-app/debian-8/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentApp() }} +{{ environment.app() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index 823290ded..450041601 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/debian-9/Dockerfile.jinja2 b/docker/base-app/debian-9/Dockerfile.jinja2 index a4c1fed74..824c9cf6e 100644 --- a/docker/base-app/debian-9/Dockerfile.jinja2 +++ b/docker/base-app/debian-9/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentApp() }} +{{ environment.app() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index 44ae82d84..ea664c17b 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 index bdae234ac..e4e7bd863 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentApp() }} +{{ environment.app() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index 1310ca755..5be91ceef 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 index abd33dad4..c896ae0c4 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentApp() }} +{{ environment.app() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index e5959305d..9c4827301 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 index 82f6fb3c8..0d8bdcf1b 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentApp() }} +{{ environment.app() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index 287abc3ff..5bc0dcc76 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 b/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 index 83a1040cd..35ff82770 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentApp() }} +{{ environment.app() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index eb57f6382..0376de75e 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 index 91a1c2905..6aeaa7f4c 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentApp() }} +{{ environment.app() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile index 5a583d41d..1e5dda7c9 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/alpine-3/Dockerfile.jinja2 b/docker/base/alpine-3/Dockerfile.jinja2 index 2c606369c..09a16ecd4 100644 --- a/docker/base/alpine-3/Dockerfile.jinja2 +++ b/docker/base/alpine-3/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentHomePath() }} +{{ environment.homePath() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 0973d9805..e99c470d7 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/centos-7/Dockerfile.jinja2 b/docker/base/centos-7/Dockerfile.jinja2 index a6d70e192..04251e84a 100644 --- a/docker/base/centos-7/Dockerfile.jinja2 +++ b/docker/base/centos-7/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentHomePath() }} +{{ environment.homePath() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index aee91540d..f887fa997 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-7/Dockerfile.jinja2 b/docker/base/debian-7/Dockerfile.jinja2 index 8fef304ac..0712c0d90 100644 --- a/docker/base/debian-7/Dockerfile.jinja2 +++ b/docker/base/debian-7/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentHomePath() }} +{{ environment.homePath() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index ac6569f1d..16a8948d0 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-8/Dockerfile.jinja2 b/docker/base/debian-8/Dockerfile.jinja2 index d0b234884..b8e1602cf 100644 --- a/docker/base/debian-8/Dockerfile.jinja2 +++ b/docker/base/debian-8/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentHomePath() }} +{{ environment.homePath() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 1b906d80f..ed2bafcf5 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-9/Dockerfile.jinja2 b/docker/base/debian-9/Dockerfile.jinja2 index 84128f2e9..d43d021d2 100644 --- a/docker/base/debian-9/Dockerfile.jinja2 +++ b/docker/base/debian-9/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentHomePath() }} +{{ environment.homePath() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index d031d92e1..5692afce9 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-12.04/Dockerfile.jinja2 b/docker/base/ubuntu-12.04/Dockerfile.jinja2 index 79f532495..765843d39 100644 --- a/docker/base/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-12.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentHomePath() }} +{{ environment.homePath() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 58e9e406c..f77385621 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-14.04/Dockerfile.jinja2 b/docker/base/ubuntu-14.04/Dockerfile.jinja2 index 574bae8fb..88a50dc97 100644 --- a/docker/base/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-14.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentHomePath() }} +{{ environment.homePath() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 33439f046..b25455d78 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-15.04/Dockerfile.jinja2 b/docker/base/ubuntu-15.04/Dockerfile.jinja2 index 6ba95aac8..076c9fe10 100644 --- a/docker/base/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-15.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentHomePath() }} +{{ environment.homePath() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 43f5f3530..aded550f9 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-15.10/Dockerfile.jinja2 b/docker/base/ubuntu-15.10/Dockerfile.jinja2 index 7d0514a44..e6c13ab5e 100644 --- a/docker/base/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/base/ubuntu-15.10/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentHomePath() }} +{{ environment.homePath() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index dd799e3e3..33e450f9c 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-16.04/Dockerfile.jinja2 b/docker/base/ubuntu-16.04/Dockerfile.jinja2 index 1a0f2f171..b96158a0a 100644 --- a/docker/base/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-16.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentHomePath() }} +{{ environment.homePath() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index f1a0ddf4c..86cce71a8 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM alpine:3.3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/alpine-3/Dockerfile.jinja2 b/docker/bootstrap/alpine-3/Dockerfile.jinja2 index 21b6510ef..7716df1b6 100644 --- a/docker/bootstrap/alpine-3/Dockerfile.jinja2 +++ b/docker/bootstrap/alpine-3/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentLang() }} +{{ environment.lang() }} {{ docker.add('baselayout.tar', '/') }} diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 4407c70ff..49cb4333c 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/centos-7/Dockerfile.jinja2 b/docker/bootstrap/centos-7/Dockerfile.jinja2 index f0882f772..a9bdfdd16 100644 --- a/docker/bootstrap/centos-7/Dockerfile.jinja2 +++ b/docker/bootstrap/centos-7/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentLang() }} +{{ environment.lang() }} {{ docker.add('baselayout.tar', '/') }} diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index 68c041c29..20fcf84c6 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-7/Dockerfile.jinja2 b/docker/bootstrap/debian-7/Dockerfile.jinja2 index 79df7bfe4..595722d9f 100644 --- a/docker/bootstrap/debian-7/Dockerfile.jinja2 +++ b/docker/bootstrap/debian-7/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentLang() }} +{{ environment.lang() }} {{ docker.add('baselayout.tar', '/') }} diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 3a6428732..6f6e5a61a 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-8/Dockerfile.jinja2 b/docker/bootstrap/debian-8/Dockerfile.jinja2 index e52da940c..eb117e056 100644 --- a/docker/bootstrap/debian-8/Dockerfile.jinja2 +++ b/docker/bootstrap/debian-8/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentLang() }} +{{ environment.lang() }} {{ docker.add('baselayout.tar', '/') }} diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 0f9a42b96..78349c52b 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-9/Dockerfile.jinja2 b/docker/bootstrap/debian-9/Dockerfile.jinja2 index 084578e33..d1608c730 100644 --- a/docker/bootstrap/debian-9/Dockerfile.jinja2 +++ b/docker/bootstrap/debian-9/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentLang() }} +{{ environment.lang() }} {{ docker.add('baselayout.tar', '/') }} diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 83d518859..b83e036c3 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 index 72ee5fd94..b4708214c 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentLang() }} +{{ environment.lang() }} {{ docker.add('baselayout.tar', '/') }} diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 9a7ac887e..7908a4480 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 index aa7b84406..da778233f 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentLang() }} +{{ environment.lang() }} {{ docker.add('baselayout.tar', '/') }} diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 70a9e6492..b7c4c389c 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 index a237b0c53..395657438 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentLang() }} +{{ environment.lang() }} {{ docker.add('baselayout.tar', '/') }} diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 73d5a6e8e..e470d23ee 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 index bc78f3b69..2e8c5882e 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentLang() }} +{{ environment.lang() }} {{ docker.add('baselayout.tar', '/') }} diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index c7cb8ad12..8a813bdc2 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 index 592a29df4..85218fd33 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentLang() }} +{{ environment.lang() }} {{ docker.add('baselayout.tar', '/') }} diff --git a/docker/hhvm-apache/ubuntu-14.04/Dockerfile b/docker/hhvm-apache/ubuntu-14.04/Dockerfile index 3faac697c..26a978b1a 100644 --- a/docker/hhvm-apache/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-14.04/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/hhvm:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/hhvm-apache/ubuntu-14.04/Dockerfile.jinja2 b/docker/hhvm-apache/ubuntu-14.04/Dockerfile.jinja2 index 05abcc733..f3e377099 100644 --- a/docker/hhvm-apache/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/hhvm-apache/ubuntu-14.04/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/hhvm-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/hhvm-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/hhvm-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/hhvm-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/hhvm-apache/ubuntu-16.04/Dockerfile b/docker/hhvm-apache/ubuntu-16.04/Dockerfile index 848aaf089..10426789d 100644 --- a/docker/hhvm-apache/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-16.04/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/hhvm:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/hhvm-apache/ubuntu-16.04/Dockerfile.jinja2 b/docker/hhvm-apache/ubuntu-16.04/Dockerfile.jinja2 index 1ae0ba518..11dc1b0db 100644 --- a/docker/hhvm-apache/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/hhvm-apache/ubuntu-16.04/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/hhvm-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/hhvm-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/hhvm-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/hhvm-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile index 87ddd8de5..2c4e32ebe 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/hhvm:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile.jinja2 b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile.jinja2 index 35a4e598b..a3525392d 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/hhvm-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/hhvm-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/hhvm-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile index fc38ee678..2a4340424 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/hhvm:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile.jinja2 b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile.jinja2 index 7fed85b85..0d3295069 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/hhvm-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/hhvm-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/hhvm-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/hhvm/ubuntu-14.04/Dockerfile b/docker/hhvm/ubuntu-14.04/Dockerfile index 9e175f589..e2b28199e 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm/ubuntu-14.04/Dockerfile.jinja2 b/docker/hhvm/ubuntu-14.04/Dockerfile.jinja2 index b3835d8ab..2467b22d6 100644 --- a/docker/hhvm/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/hhvm/ubuntu-14.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/hhvm/ubuntu-16.04/Dockerfile b/docker/hhvm/ubuntu-16.04/Dockerfile index 7a319fd69..06f604dc3 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm/ubuntu-16.04/Dockerfile.jinja2 b/docker/hhvm/ubuntu-16.04/Dockerfile.jinja2 index 102f5da81..f2c47cf88 100644 --- a/docker/hhvm/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/hhvm/ubuntu-16.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/mail-sandbox/ubuntu-14.04/Dockerfile b/docker/mail-sandbox/latest/Dockerfile similarity index 88% rename from docker/mail-sandbox/ubuntu-14.04/Dockerfile rename to docker/mail-sandbox/latest/Dockerfile index e5a78fdc7..ce118458f 100644 --- a/docker/mail-sandbox/ubuntu-14.04/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/mail-sandbox:ubuntu-14.04 +# Dockerfile for webdevops/mail-sandbox:latest # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ @@ -8,7 +8,7 @@ FROM webdevops/postfix:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV MAILBOX_USERNAME "sandbox" ENV MAILBOX_PASSWORD "mail" diff --git a/docker/mail-sandbox/ubuntu-14.04/Dockerfile.jinja2 b/docker/mail-sandbox/latest/Dockerfile.jinja2 similarity index 83% rename from docker/mail-sandbox/ubuntu-14.04/Dockerfile.jinja2 rename to docker/mail-sandbox/latest/Dockerfile.jinja2 index cc930de14..ae5219d3e 100644 --- a/docker/mail-sandbox/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/mail-sandbox/latest/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentMailbox() }} +{{ environment.mailbox() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/mail-sandbox/ubuntu-14.04/conf/bin/service.d/dovecot.d/10-init.sh b/docker/mail-sandbox/latest/conf/bin/service.d/dovecot.d/10-init.sh similarity index 100% rename from docker/mail-sandbox/ubuntu-14.04/conf/bin/service.d/dovecot.d/10-init.sh rename to docker/mail-sandbox/latest/conf/bin/service.d/dovecot.d/10-init.sh diff --git a/docker/mail-sandbox/ubuntu-14.04/conf/bin/service.d/dovecot.sh b/docker/mail-sandbox/latest/conf/bin/service.d/dovecot.sh similarity index 100% rename from docker/mail-sandbox/ubuntu-14.04/conf/bin/service.d/dovecot.sh rename to docker/mail-sandbox/latest/conf/bin/service.d/dovecot.sh diff --git a/docker/mail-sandbox/ubuntu-14.04/conf/etc/supervisor.d/dovecot.conf b/docker/mail-sandbox/latest/conf/etc/supervisor.d/dovecot.conf similarity index 100% rename from docker/mail-sandbox/ubuntu-14.04/conf/etc/supervisor.d/dovecot.conf rename to docker/mail-sandbox/latest/conf/etc/supervisor.d/dovecot.conf diff --git a/docker/mail-sandbox/ubuntu-14.04/conf/provision/roles/webdevops-mail-sandbox/defaults/main.yml b/docker/mail-sandbox/latest/conf/provision/roles/webdevops-mail-sandbox/defaults/main.yml similarity index 100% rename from docker/mail-sandbox/ubuntu-14.04/conf/provision/roles/webdevops-mail-sandbox/defaults/main.yml rename to docker/mail-sandbox/latest/conf/provision/roles/webdevops-mail-sandbox/defaults/main.yml diff --git a/docker/mail-sandbox/ubuntu-14.04/conf/provision/roles/webdevops-mail-sandbox/files/dovecot/local.conf b/docker/mail-sandbox/latest/conf/provision/roles/webdevops-mail-sandbox/files/dovecot/local.conf similarity index 100% rename from docker/mail-sandbox/ubuntu-14.04/conf/provision/roles/webdevops-mail-sandbox/files/dovecot/local.conf rename to docker/mail-sandbox/latest/conf/provision/roles/webdevops-mail-sandbox/files/dovecot/local.conf diff --git a/docker/mail-sandbox/ubuntu-14.04/conf/provision/roles/webdevops-mail-sandbox/tasks/bootstrap/dovecot.yml b/docker/mail-sandbox/latest/conf/provision/roles/webdevops-mail-sandbox/tasks/bootstrap/dovecot.yml similarity index 100% rename from docker/mail-sandbox/ubuntu-14.04/conf/provision/roles/webdevops-mail-sandbox/tasks/bootstrap/dovecot.yml rename to docker/mail-sandbox/latest/conf/provision/roles/webdevops-mail-sandbox/tasks/bootstrap/dovecot.yml diff --git a/docker/mail-sandbox/ubuntu-14.04/conf/provision/roles/webdevops-mail-sandbox/tasks/bootstrap/postfix.yml b/docker/mail-sandbox/latest/conf/provision/roles/webdevops-mail-sandbox/tasks/bootstrap/postfix.yml similarity index 100% rename from docker/mail-sandbox/ubuntu-14.04/conf/provision/roles/webdevops-mail-sandbox/tasks/bootstrap/postfix.yml rename to docker/mail-sandbox/latest/conf/provision/roles/webdevops-mail-sandbox/tasks/bootstrap/postfix.yml diff --git a/docker/mail-sandbox/ubuntu-14.04/conf/provision/roles/webdevops-mail-sandbox/tasks/entrypoint/postfix.yml b/docker/mail-sandbox/latest/conf/provision/roles/webdevops-mail-sandbox/tasks/entrypoint/postfix.yml similarity index 100% rename from docker/mail-sandbox/ubuntu-14.04/conf/provision/roles/webdevops-mail-sandbox/tasks/entrypoint/postfix.yml rename to docker/mail-sandbox/latest/conf/provision/roles/webdevops-mail-sandbox/tasks/entrypoint/postfix.yml diff --git a/docker/mail-sandbox/ubuntu-14.04/conf/provision/roles/webdevops-mail-sandbox/tasks/entrypoint/user.yml b/docker/mail-sandbox/latest/conf/provision/roles/webdevops-mail-sandbox/tasks/entrypoint/user.yml similarity index 100% rename from docker/mail-sandbox/ubuntu-14.04/conf/provision/roles/webdevops-mail-sandbox/tasks/entrypoint/user.yml rename to docker/mail-sandbox/latest/conf/provision/roles/webdevops-mail-sandbox/tasks/entrypoint/user.yml diff --git a/docker/mail-sandbox/ubuntu-14.04/conf/provision/roles/webdevops-mail-sandbox/tasks/main.yml b/docker/mail-sandbox/latest/conf/provision/roles/webdevops-mail-sandbox/tasks/main.yml similarity index 100% rename from docker/mail-sandbox/ubuntu-14.04/conf/provision/roles/webdevops-mail-sandbox/tasks/main.yml rename to docker/mail-sandbox/latest/conf/provision/roles/webdevops-mail-sandbox/tasks/main.yml diff --git a/docker/mail-sandbox/ubuntu-14.04/conf/provision/roles/webdevops-mail-sandbox/templates/postfix/recipient_canonical_maps.txt.j2 b/docker/mail-sandbox/latest/conf/provision/roles/webdevops-mail-sandbox/templates/postfix/recipient_canonical_maps.txt.j2 similarity index 100% rename from docker/mail-sandbox/ubuntu-14.04/conf/provision/roles/webdevops-mail-sandbox/templates/postfix/recipient_canonical_maps.txt.j2 rename to docker/mail-sandbox/latest/conf/provision/roles/webdevops-mail-sandbox/templates/postfix/recipient_canonical_maps.txt.j2 diff --git a/docker/nginx/alpine-3/Dockerfile b/docker/nginx/alpine-3/Dockerfile index ae5164b21..6cb74f44b 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/alpine-3/Dockerfile.jinja2 b/docker/nginx/alpine-3/Dockerfile.jinja2 index 412c4c019..0be9b5e64 100644 --- a/docker/nginx/alpine-3/Dockerfile.jinja2 +++ b/docker/nginx/alpine-3/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/nginx/alpine-3/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/alpine-3/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/nginx/alpine-3/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/nginx/alpine-3/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index 4fe7c6c2e..f15351f8e 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/centos-7/Dockerfile.jinja2 b/docker/nginx/centos-7/Dockerfile.jinja2 index 7ad2aeeae..6401fcd50 100644 --- a/docker/nginx/centos-7/Dockerfile.jinja2 +++ b/docker/nginx/centos-7/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/nginx/centos-7/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/centos-7/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/nginx/centos-7/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/nginx/centos-7/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index 576c3245c..a8e02996f 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-7/Dockerfile.jinja2 b/docker/nginx/debian-7/Dockerfile.jinja2 index b35e48eef..f7bc02c78 100644 --- a/docker/nginx/debian-7/Dockerfile.jinja2 +++ b/docker/nginx/debian-7/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/nginx/debian-7/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/debian-7/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/nginx/debian-7/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/nginx/debian-7/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index 4f2309285..21b00ac85 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-8/Dockerfile.jinja2 b/docker/nginx/debian-8/Dockerfile.jinja2 index c9508d7ff..75fae8911 100644 --- a/docker/nginx/debian-8/Dockerfile.jinja2 +++ b/docker/nginx/debian-8/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/nginx/debian-8/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/debian-8/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/nginx/debian-8/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/nginx/debian-8/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index debd10d52..40e64e9c5 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-9/Dockerfile.jinja2 b/docker/nginx/debian-9/Dockerfile.jinja2 index 53a343a46..69e46a1d3 100644 --- a/docker/nginx/debian-9/Dockerfile.jinja2 +++ b/docker/nginx/debian-9/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/nginx/debian-9/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/debian-9/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/nginx/debian-9/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/nginx/debian-9/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index 4a42d9fb3..7d8d60a67 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 index 2d5476511..275cb76f9 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/nginx/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/nginx/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index af8931866..dbfd6b6d1 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 index 6b2c10afe..3ef996efd 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/ubuntu-14.04/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/nginx/ubuntu-14.04/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/nginx/ubuntu-14.04/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index fbfb59c08..8fda4e139 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 index f71d1cf98..03f670fa2 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/ubuntu-15.04/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/nginx/ubuntu-15.04/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/nginx/ubuntu-15.04/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index 2dc753507..2b2f2feca 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 b/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 index 07fe15bca..8c433be7d 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/ubuntu-15.10/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/nginx/ubuntu-15.10/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/nginx/ubuntu-15.10/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index 11053625d..0567cddbb 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 index da733d0b1..9dfe66136 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/ubuntu-16.04/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/nginx/ubuntu-16.04/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/nginx/ubuntu-16.04/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-apache-dev/alpine-3-php7/Dockerfile b/docker/php-apache-dev/alpine-3-php7/Dockerfile index 9b2447b68..ab6a91153 100644 --- a/docker/php-apache-dev/alpine-3-php7/Dockerfile +++ b/docker/php-apache-dev/alpine-3-php7/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ @@ -26,7 +28,7 @@ RUN /usr/local/bin/apk-install \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/alpine-3-php7/Dockerfile.jinja2 b/docker/php-apache-dev/alpine-3-php7/Dockerfile.jinja2 index f311a2002..bd51f1683 100644 --- a/docker/php-apache-dev/alpine-3-php7/Dockerfile.jinja2 +++ b/docker/php-apache-dev/alpine-3-php7/Dockerfile.jinja2 @@ -2,10 +2,12 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.alpine('php-apache') }} +{{ apache.alpine('php-apache php-apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/conf.d/10-php.conf index b017879ad..b91e36bb9 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ - +> ProxySet connectiontimeout=5 timeout=600 - SetHandler "proxy:fcgi://127.0.0.1:9000" + SetHandler "proxy:fcgi://" diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-apache-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-apache-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-apache-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-apache-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/alpine-3/Dockerfile b/docker/php-apache-dev/alpine-3/Dockerfile index 27686c3bd..8c78d9ad8 100644 --- a/docker/php-apache-dev/alpine-3/Dockerfile +++ b/docker/php-apache-dev/alpine-3/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ @@ -26,7 +28,7 @@ RUN /usr/local/bin/apk-install \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/alpine-3/Dockerfile.jinja2 b/docker/php-apache-dev/alpine-3/Dockerfile.jinja2 index 33c7d301c..f9ed8c68c 100644 --- a/docker/php-apache-dev/alpine-3/Dockerfile.jinja2 +++ b/docker/php-apache-dev/alpine-3/Dockerfile.jinja2 @@ -2,10 +2,12 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.alpine('php-apache') }} +{{ apache.alpine('php-apache php-apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-apache-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-apache-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache-dev/alpine-3/conf/etc/httpd/conf.d/10-php.conf index b017879ad..b91e36bb9 100644 --- a/docker/php-apache-dev/alpine-3/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache-dev/alpine-3/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ - +> ProxySet connectiontimeout=5 timeout=600 - SetHandler "proxy:fcgi://127.0.0.1:9000" + SetHandler "proxy:fcgi://" diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-apache-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-apache-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-apache-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-apache-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-apache-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile index d84c0d614..c36080b05 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ @@ -24,7 +26,7 @@ RUN /usr/local/bin/yum-install \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/centos-7/Dockerfile.jinja2 b/docker/php-apache-dev/centos-7/Dockerfile.jinja2 index f14ff15f6..a2353ffca 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile.jinja2 +++ b/docker/php-apache-dev/centos-7/Dockerfile.jinja2 @@ -2,10 +2,12 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.centos('php-apache') }} +{{ apache.centos('php-apache php-apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-apache-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-apache-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/centos-7/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache-dev/centos-7/conf/etc/httpd/conf.d/10-php.conf index b017879ad..b91e36bb9 100644 --- a/docker/php-apache-dev/centos-7/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache-dev/centos-7/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ - +> ProxySet connectiontimeout=5 timeout=600 - SetHandler "proxy:fcgi://127.0.0.1:9000" + SetHandler "proxy:fcgi://" diff --git a/docker/php-apache-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-apache-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-apache-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-apache-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-apache-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-apache-dev/centos-7/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-apache-dev/centos-7/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-apache-dev/centos-7/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile index fe8ad6a9e..f9b2541e8 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ @@ -27,7 +29,7 @@ RUN /usr/local/bin/apt-install \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/debian-7/Dockerfile.jinja2 b/docker/php-apache-dev/debian-7/Dockerfile.jinja2 index b438f864e..1fedec9f2 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile.jinja2 +++ b/docker/php-apache-dev/debian-7/Dockerfile.jinja2 @@ -2,10 +2,12 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.debian8('php-apache') }} +{{ apache.debian8('php-apache php-apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-apache-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-apache-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/debian-7/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache-dev/debian-7/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/php-apache-dev/debian-7/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache-dev/debian-7/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/php-apache-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-apache-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-apache-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-apache-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-apache-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-apache-dev/debian-7/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-apache-dev/debian-7/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-apache-dev/debian-7/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile index b06d1c4e3..fc620c663 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ @@ -27,7 +29,7 @@ RUN /usr/local/bin/apt-install \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 b/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 index cbac7c55e..dc9a56563 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 @@ -2,10 +2,12 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.debian8('php-apache') }} +{{ apache.debian8('php-apache php-apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/debian-8-php7/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache-dev/debian-8-php7/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache-dev/debian-8-php7/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/php-apache-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-apache-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-apache-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-apache-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-apache-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-apache-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-apache-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile index 8cd66b26c..b62e04e2b 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ @@ -27,7 +29,7 @@ RUN /usr/local/bin/apt-install \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/debian-8/Dockerfile.jinja2 b/docker/php-apache-dev/debian-8/Dockerfile.jinja2 index b1f86a1f4..00d798e30 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile.jinja2 +++ b/docker/php-apache-dev/debian-8/Dockerfile.jinja2 @@ -2,10 +2,12 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.debian8('php-apache') }} +{{ apache.debian8('php-apache php-apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-apache-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-apache-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/debian-8/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache-dev/debian-8/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/php-apache-dev/debian-8/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache-dev/debian-8/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/php-apache-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-apache-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-apache-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-apache-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-apache-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-apache-dev/debian-8/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-apache-dev/debian-8/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-apache-dev/debian-8/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile index ab926bc09..1c313429d 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ @@ -26,7 +28,7 @@ RUN /usr/local/bin/apt-install \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/debian-9/Dockerfile.jinja2 b/docker/php-apache-dev/debian-9/Dockerfile.jinja2 index 7f9f4396c..d9612680c 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile.jinja2 +++ b/docker/php-apache-dev/debian-9/Dockerfile.jinja2 @@ -2,10 +2,12 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.debian9('php-apache') }} +{{ apache.debian9('php-apache php-apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-apache-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-apache-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/debian-9/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache-dev/debian-9/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/php-apache-dev/debian-9/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache-dev/debian-9/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/php-apache-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-apache-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-apache-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-apache-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-apache-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-apache-dev/debian-9/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-apache-dev/debian-9/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-apache-dev/debian-9/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile index cd9b1ee3e..7b789c12e 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ @@ -28,7 +30,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers version expires \ && mkdir -p /var/lock/apache2 \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 index aaec7b26e..a116dbe32 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -2,10 +2,12 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.ubuntu12('php-apache') }} +{{ apache.ubuntu12('php-apache php-apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-apache-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-apache-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-apache-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile index c6c92b3ed..6fc9366df 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ @@ -28,7 +30,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ && mkdir -p /var/lock/apache2 \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 index 087628f97..c00ac58d4 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -2,10 +2,12 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.ubuntu14('php-apache') }} +{{ apache.ubuntu14('php-apache php-apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-apache-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-apache-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-apache-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile index cb1bdbe80..2b70be0d2 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ @@ -27,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions fastcgi ssl rewrite headers expires \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 index ca45b48c4..3fba515c0 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -2,10 +2,12 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.ubuntu15('php-apache') }} +{{ apache.ubuntu15('php-apache php-apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-apache-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-apache-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile index 7bbc91429..c1dca47b8 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ @@ -27,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions fastcgi ssl rewrite headers expires \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 index dbbc0c85e..eb20bbf9c 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -2,10 +2,12 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.ubuntu16('php-apache') }} +{{ apache.ubuntu16('php-apache php-apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile index 97ec367b8..e5246499a 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ @@ -27,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions fastcgi ssl rewrite headers expires \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 index b9bd4994c..d39068333 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -2,10 +2,12 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.ubuntu16('php-apache') }} +{{ apache.ubuntu16('php-apache php-apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache/alpine-3-php7/Dockerfile b/docker/php-apache/alpine-3-php7/Dockerfile index a7aad13be..d7cd40c9d 100644 --- a/docker/php-apache/alpine-3-php7/Dockerfile +++ b/docker/php-apache/alpine-3-php7/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/alpine-3-php7/Dockerfile.jinja2 b/docker/php-apache/alpine-3-php7/Dockerfile.jinja2 index c7cb45d69..b740ac1d9 100644 --- a/docker/php-apache/alpine-3-php7/Dockerfile.jinja2 +++ b/docker/php-apache/alpine-3-php7/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-apache/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache/alpine-3-php7/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/alpine-3-php7/conf/etc/httpd/conf.d/10-php.conf index b017879ad..b91e36bb9 100644 --- a/docker/php-apache/alpine-3-php7/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache/alpine-3-php7/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ - +> ProxySet connectiontimeout=5 timeout=600 - SetHandler "proxy:fcgi://127.0.0.1:9000" + SetHandler "proxy:fcgi://" diff --git a/docker/php-apache/alpine-3/Dockerfile b/docker/php-apache/alpine-3/Dockerfile index 5161a2577..243161545 100644 --- a/docker/php-apache/alpine-3/Dockerfile +++ b/docker/php-apache/alpine-3/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/alpine-3/Dockerfile.jinja2 b/docker/php-apache/alpine-3/Dockerfile.jinja2 index 0c6f4d6d9..d1dd382b4 100644 --- a/docker/php-apache/alpine-3/Dockerfile.jinja2 +++ b/docker/php-apache/alpine-3/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache/alpine-3/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/alpine-3/conf/etc/httpd/conf.d/10-php.conf index b017879ad..b91e36bb9 100644 --- a/docker/php-apache/alpine-3/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache/alpine-3/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ - +> ProxySet connectiontimeout=5 timeout=600 - SetHandler "proxy:fcgi://127.0.0.1:9000" + SetHandler "proxy:fcgi://" diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index 7e1bdc996..8e7296548 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/centos-7/Dockerfile.jinja2 b/docker/php-apache/centos-7/Dockerfile.jinja2 index 97782fe4d..28e91a3ba 100644 --- a/docker/php-apache/centos-7/Dockerfile.jinja2 +++ b/docker/php-apache/centos-7/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-php.conf index b017879ad..b91e36bb9 100644 --- a/docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ - +> ProxySet connectiontimeout=5 timeout=600 - SetHandler "proxy:fcgi://127.0.0.1:9000" + SetHandler "proxy:fcgi://" diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index b0d21d8a6..04d279c5d 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/debian-7/Dockerfile.jinja2 b/docker/php-apache/debian-7/Dockerfile.jinja2 index 642049581..02d93cce6 100644 --- a/docker/php-apache/debian-7/Dockerfile.jinja2 +++ b/docker/php-apache/debian-7/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index f65adf85c..76f73209d 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/debian-8-php7/Dockerfile.jinja2 b/docker/php-apache/debian-8-php7/Dockerfile.jinja2 index c236d10c8..4a3d427cb 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-apache/debian-8-php7/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index 9d3bf6b2a..a105fb820 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/debian-8/Dockerfile.jinja2 b/docker/php-apache/debian-8/Dockerfile.jinja2 index daffd8909..2dce31576 100644 --- a/docker/php-apache/debian-8/Dockerfile.jinja2 +++ b/docker/php-apache/debian-8/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index b1d4b9a0d..710bde0e7 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/debian-9/Dockerfile.jinja2 b/docker/php-apache/debian-9/Dockerfile.jinja2 index c4c121b48..17ab1a5b9 100644 --- a/docker/php-apache/debian-9/Dockerfile.jinja2 +++ b/docker/php-apache/debian-9/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index f2e5aabed..0357613af 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 index 4218a7608..4aab83610 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index d2cee71cc..962520fb6 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 index f6ebc58b0..90f10f302 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index 188ace4b3..4c7e21b7c 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 index 43a07f913..bf0d4f525 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index 37fb34b44..1c2f52732 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 index ace24a279..dc9ec6109 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index a0aec0378..92928561c 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 index 32dcbf83a..89fee4ea8 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/docker/php-dev/alpine-3-php7/Dockerfile b/docker/php-dev/alpine-3-php7/Dockerfile index 0e9f2dfc0..0b56aeef6 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine-3/Dockerfile index ef29f2b7b..ae315cd7d 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index 4521aedd3..2985dc4af 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-dev/centos-7/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-dev/centos-7/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-dev/centos-7/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index f5645f5f5..5c0f3d519 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-dev/debian-7/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-dev/debian-7/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-dev/debian-7/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index 2f5daa30b..0084c3630 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index f45f4533e..4e18f0a3a 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-dev/debian-8/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-dev/debian-8/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-dev/debian-8/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index d170a39f5..9fee24ec5 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-dev/debian-9/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-dev/debian-9/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-dev/debian-9/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index ae88ca218..b0870b416 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index 1738cc836..1c5f23682 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index 7d3a83a2b..ade1632e2 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index 56d923da7..5794d592f 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index d2af4b1d3..908fb0090 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/alpine-3-php7/Dockerfile b/docker/php-nginx-dev/alpine-3-php7/Dockerfile index 13b736b35..06756c6ef 100644 --- a/docker/php-nginx-dev/alpine-3-php7/Dockerfile +++ b/docker/php-nginx-dev/alpine-3-php7/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2 b/docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2 index 942651cc8..e062086a1 100644 --- a/docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2 @@ -2,7 +2,9 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-nginx-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf index 4a6eaa050..28fd811bc 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ b/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -1,5 +1,3 @@ location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; + try_files $uri $uri/ /?$query_string; } diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile b/docker/php-nginx-dev/alpine-3/Dockerfile index 6e7834d0c..18f301cef 100644 --- a/docker/php-nginx-dev/alpine-3/Dockerfile +++ b/docker/php-nginx-dev/alpine-3/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile.jinja2 b/docker/php-nginx-dev/alpine-3/Dockerfile.jinja2 index 80accd35d..5fb85a652 100644 --- a/docker/php-nginx-dev/alpine-3/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/alpine-3/Dockerfile.jinja2 @@ -2,7 +2,9 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-nginx-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-nginx-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx-dev/alpine-3/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx-dev/alpine-3/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-location-root.conf index 4a6eaa050..28fd811bc 100644 --- a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ b/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -1,5 +1,3 @@ location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; + try_files $uri $uri/ /?$query_string; } diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index c9d808e0e..af2ea5056 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 b/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 index bdab055fe..8a07aa3fa 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 @@ -2,7 +2,9 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-nginx-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-nginx-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-nginx-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-nginx-dev/centos-7/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx-dev/centos-7/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx-dev/centos-7/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx-dev/centos-7/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-location-root.conf index 4a6eaa050..28fd811bc 100644 --- a/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ b/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -1,5 +1,3 @@ location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; + try_files $uri $uri/ /?$query_string; } diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index 32191cdaf..c8291f388 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 index 84b6e4007..e5e71298c 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 @@ -2,7 +2,9 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-nginx-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-nginx-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-nginx-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-nginx-dev/debian-7/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx-dev/debian-7/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx-dev/debian-7/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx-dev/debian-7/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-location-root.conf index 4a6eaa050..28fd811bc 100644 --- a/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ b/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -1,5 +1,3 @@ location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; + try_files $uri $uri/ /?$query_string; } diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index 92ffd2786..58bbe9605 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 index 27a862bc6..0bf81dfb7 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 @@ -2,7 +2,9 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-nginx-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf index 4a6eaa050..28fd811bc 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -1,5 +1,3 @@ location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; + try_files $uri $uri/ /?$query_string; } diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index 5b445b55a..22a2d9ca9 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 index a927a58c6..ce643a693 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 @@ -2,7 +2,9 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-nginx-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-nginx-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-nginx-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-nginx-dev/debian-8/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx-dev/debian-8/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx-dev/debian-8/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx-dev/debian-8/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-location-root.conf index 4a6eaa050..28fd811bc 100644 --- a/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ b/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -1,5 +1,3 @@ location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; + try_files $uri $uri/ /?$query_string; } diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index e9b186b40..a162cc53f 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 index b0cbc7985..6c09b612b 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 @@ -2,7 +2,9 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-nginx-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-nginx-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-nginx-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-nginx-dev/debian-9/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx-dev/debian-9/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx-dev/debian-9/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx-dev/debian-9/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-location-root.conf index 4a6eaa050..28fd811bc 100644 --- a/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ b/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -1,5 +1,3 @@ location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; + try_files $uri $uri/ /?$query_string; } diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index 39c3e932f..48837e142 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 index 83bed7cee..01d7cc434 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -2,7 +2,9 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-location-root.conf index 4a6eaa050..28fd811bc 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -1,5 +1,3 @@ location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; + try_files $uri $uri/ /?$query_string; } diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index b3837e9d5..5b280600f 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 index fec282075..8ba962027 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -2,7 +2,9 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-location-root.conf index 4a6eaa050..28fd811bc 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -1,5 +1,3 @@ location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; + try_files $uri $uri/ /?$query_string; } diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index b6bf73d98..cb3dad673 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 index d8e56dc2e..5bb91375e 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -2,7 +2,9 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-location-root.conf index 4a6eaa050..28fd811bc 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -1,5 +1,3 @@ location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; + try_files $uri $uri/ /?$query_string; } diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index 1255382ab..a22faa35a 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 index 426ed9e0f..db007f921 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -2,7 +2,9 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-location-root.conf index 4a6eaa050..28fd811bc 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -1,5 +1,3 @@ location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; + try_files $uri $uri/ /?$query_string; } diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index 56c6ddde9..53f8b5fae 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -8,11 +8,13 @@ FROM webdevops/php-dev:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 index 573f38d57..50f8b08a7 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -2,7 +2,9 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-location-root.conf index 4a6eaa050..28fd811bc 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -1,5 +1,3 @@ location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; + try_files $uri $uri/ /?$query_string; } diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx/alpine-3-php7/Dockerfile b/docker/php-nginx/alpine-3-php7/Dockerfile index 6b56163b3..dc2bb4830 100644 --- a/docker/php-nginx/alpine-3-php7/Dockerfile +++ b/docker/php-nginx/alpine-3-php7/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/alpine-3-php7/Dockerfile.jinja2 b/docker/php-nginx/alpine-3-php7/Dockerfile.jinja2 index 4d118a2e7..4aabcf874 100644 --- a/docker/php-nginx/alpine-3-php7/Dockerfile.jinja2 +++ b/docker/php-nginx/alpine-3-php7/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/alpine-3-php7/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx/alpine-3-php7/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx/alpine-3/Dockerfile b/docker/php-nginx/alpine-3/Dockerfile index 5229ed601..7181961b8 100644 --- a/docker/php-nginx/alpine-3/Dockerfile +++ b/docker/php-nginx/alpine-3/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/alpine-3/Dockerfile.jinja2 b/docker/php-nginx/alpine-3/Dockerfile.jinja2 index fb3e3261f..b6d43f583 100644 --- a/docker/php-nginx/alpine-3/Dockerfile.jinja2 +++ b/docker/php-nginx/alpine-3/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/alpine-3/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx/alpine-3/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx/alpine-3/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index 73a52d04d..af3a31e9f 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/centos-7/Dockerfile.jinja2 b/docker/php-nginx/centos-7/Dockerfile.jinja2 index 09bc93d11..0d36fa890 100644 --- a/docker/php-nginx/centos-7/Dockerfile.jinja2 +++ b/docker/php-nginx/centos-7/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/centos-7/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx/centos-7/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx/centos-7/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index bdb49e92e..311b0120f 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/debian-7/Dockerfile.jinja2 b/docker/php-nginx/debian-7/Dockerfile.jinja2 index daedc4952..35a8ff69a 100644 --- a/docker/php-nginx/debian-7/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-7/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/debian-7/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx/debian-7/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx/debian-7/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index a397b59a3..3c3401a63 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 b/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 index f2ae3dc18..bc8043deb 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/debian-8-php7/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx/debian-8-php7/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx/debian-8-php7/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index 5caadd8c5..f03389f90 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/debian-8/Dockerfile.jinja2 b/docker/php-nginx/debian-8/Dockerfile.jinja2 index 487501126..3737a4195 100644 --- a/docker/php-nginx/debian-8/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-8/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/debian-8/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx/debian-8/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx/debian-8/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index 90af1d1a4..c909bbaa8 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/debian-9/Dockerfile.jinja2 b/docker/php-nginx/debian-9/Dockerfile.jinja2 index 1c531c478..10aa7604d 100644 --- a/docker/php-nginx/debian-9/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-9/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/debian-9/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx/debian-9/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx/debian-9/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index 5ad18831a..1ac88acce 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 index 846f2c88c..84dbad02a 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index 97581ae69..ef6b0a6e0 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 index 7b782f383..b964dd07f 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index 8e66e3a0a..65d8c6303 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 index e79f4da38..706f38568 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index 58798da2b..efc1f2adc 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 index a1406b937..085cbd88a 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index cccb85f8e..16b40bfb2 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -8,11 +8,12 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 index a26e1c1a5..54e26bbee 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php/alpine-3-php7/Dockerfile b/docker/php/alpine-3-php7/Dockerfile index 0f441aecb..ca40e577a 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/alpine-3-php7/Dockerfile.jinja2 b/docker/php/alpine-3-php7/Dockerfile.jinja2 index 076874fdd..99e5e3b70 100644 --- a/docker/php/alpine-3-php7/Dockerfile.jinja2 +++ b/docker/php/alpine-3-php7/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..b17280ce6 --- /dev/null +++ b/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,34 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet ";#CLEAR_ENV_WORKAROUND#" "$VARIABLE_LIST" > /dev/null + diff --git a/docker/php/alpine-3/Dockerfile b/docker/php/alpine-3/Dockerfile index db73f56ed..9cd3c3ded 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/alpine-3/Dockerfile.jinja2 b/docker/php/alpine-3/Dockerfile.jinja2 index 7fe92e759..0656e234e 100644 --- a/docker/php/alpine-3/Dockerfile.jinja2 +++ b/docker/php/alpine-3/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..b17280ce6 --- /dev/null +++ b/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,34 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet ";#CLEAR_ENV_WORKAROUND#" "$VARIABLE_LIST" > /dev/null + 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 b88e8db98..da665ebf5 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 @@ -13,6 +13,15 @@ - debug: msg: "PHP-Version: {{php_version}}" +- set_fact: + php_clear_env_available: False + +- set_fact: + php_clear_env_available: True + when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or + ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or + ( php_version | version_compare('5.6', 'ge') ) + - name: Set php pool file set_fact: php_pool_conf: www.conf @@ -76,10 +85,19 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { key: 'clear_env', value: "no" } - when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or - ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or - ( php_version | version_compare('5.6', 'ge') ) + when: php_clear_env_available == True + +- name: Remove clear env workaround + file: + path: "/opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh" + state: absent + when: php_clear_env_available == True +- name: Append clear env workaround in php-fpm pool (old php-fpm versions) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + line: ';#CLEAR_ENV_WORKAROUND#' + when: php_clear_env_available == False - name: Disable php-fpm connection limit lineinfile: diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index d96224ccf..cf5275e2f 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/centos-7/Dockerfile.jinja2 b/docker/php/centos-7/Dockerfile.jinja2 index 7a5b7fe26..ccb3165ee 100644 --- a/docker/php/centos-7/Dockerfile.jinja2 +++ b/docker/php/centos-7/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..b17280ce6 --- /dev/null +++ b/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,34 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet ";#CLEAR_ENV_WORKAROUND#" "$VARIABLE_LIST" > /dev/null + 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 b88e8db98..da665ebf5 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 @@ -13,6 +13,15 @@ - debug: msg: "PHP-Version: {{php_version}}" +- set_fact: + php_clear_env_available: False + +- set_fact: + php_clear_env_available: True + when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or + ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or + ( php_version | version_compare('5.6', 'ge') ) + - name: Set php pool file set_fact: php_pool_conf: www.conf @@ -76,10 +85,19 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { key: 'clear_env', value: "no" } - when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or - ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or - ( php_version | version_compare('5.6', 'ge') ) + when: php_clear_env_available == True + +- name: Remove clear env workaround + file: + path: "/opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh" + state: absent + when: php_clear_env_available == True +- name: Append clear env workaround in php-fpm pool (old php-fpm versions) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + line: ';#CLEAR_ENV_WORKAROUND#' + when: php_clear_env_available == False - name: Disable php-fpm connection limit lineinfile: diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index 7ce1b2826..babfd818b 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-7/Dockerfile.jinja2 b/docker/php/debian-7/Dockerfile.jinja2 index fdfb5ed67..2dde687bd 100644 --- a/docker/php/debian-7/Dockerfile.jinja2 +++ b/docker/php/debian-7/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..b17280ce6 --- /dev/null +++ b/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,34 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet ";#CLEAR_ENV_WORKAROUND#" "$VARIABLE_LIST" > /dev/null + 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 b88e8db98..da665ebf5 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 @@ -13,6 +13,15 @@ - debug: msg: "PHP-Version: {{php_version}}" +- set_fact: + php_clear_env_available: False + +- set_fact: + php_clear_env_available: True + when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or + ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or + ( php_version | version_compare('5.6', 'ge') ) + - name: Set php pool file set_fact: php_pool_conf: www.conf @@ -76,10 +85,19 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { key: 'clear_env', value: "no" } - when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or - ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or - ( php_version | version_compare('5.6', 'ge') ) + when: php_clear_env_available == True + +- name: Remove clear env workaround + file: + path: "/opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh" + state: absent + when: php_clear_env_available == True +- name: Append clear env workaround in php-fpm pool (old php-fpm versions) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + line: ';#CLEAR_ENV_WORKAROUND#' + when: php_clear_env_available == False - name: Disable php-fpm connection limit lineinfile: diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index c92aade6a..09fe405d8 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-8-php7/Dockerfile.jinja2 b/docker/php/debian-8-php7/Dockerfile.jinja2 index 1ab81a55e..73cd351d4 100644 --- a/docker/php/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php/debian-8-php7/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..b17280ce6 --- /dev/null +++ b/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,34 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet ";#CLEAR_ENV_WORKAROUND#" "$VARIABLE_LIST" > /dev/null + diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index 6f6cafef7..0b3846235 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-8/Dockerfile.jinja2 b/docker/php/debian-8/Dockerfile.jinja2 index 340cac801..27a370861 100644 --- a/docker/php/debian-8/Dockerfile.jinja2 +++ b/docker/php/debian-8/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..b17280ce6 --- /dev/null +++ b/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,34 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet ";#CLEAR_ENV_WORKAROUND#" "$VARIABLE_LIST" > /dev/null + 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 b88e8db98..da665ebf5 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 @@ -13,6 +13,15 @@ - debug: msg: "PHP-Version: {{php_version}}" +- set_fact: + php_clear_env_available: False + +- set_fact: + php_clear_env_available: True + when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or + ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or + ( php_version | version_compare('5.6', 'ge') ) + - name: Set php pool file set_fact: php_pool_conf: www.conf @@ -76,10 +85,19 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { key: 'clear_env', value: "no" } - when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or - ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or - ( php_version | version_compare('5.6', 'ge') ) + when: php_clear_env_available == True + +- name: Remove clear env workaround + file: + path: "/opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh" + state: absent + when: php_clear_env_available == True +- name: Append clear env workaround in php-fpm pool (old php-fpm versions) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + line: ';#CLEAR_ENV_WORKAROUND#' + when: php_clear_env_available == False - name: Disable php-fpm connection limit lineinfile: diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index f39f48698..212db1ef5 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-9/Dockerfile.jinja2 b/docker/php/debian-9/Dockerfile.jinja2 index ad1e5bbe3..43a1866d3 100644 --- a/docker/php/debian-9/Dockerfile.jinja2 +++ b/docker/php/debian-9/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..b17280ce6 --- /dev/null +++ b/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,34 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet ";#CLEAR_ENV_WORKAROUND#" "$VARIABLE_LIST" > /dev/null + diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index 62a2e9050..c9fb549f6 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-12.04/Dockerfile.jinja2 b/docker/php/ubuntu-12.04/Dockerfile.jinja2 index df0b9b88d..3cbd23ec1 100644 --- a/docker/php/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php/ubuntu-12.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..b17280ce6 --- /dev/null +++ b/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,34 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet ";#CLEAR_ENV_WORKAROUND#" "$VARIABLE_LIST" > /dev/null + 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 b88e8db98..da665ebf5 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 @@ -13,6 +13,15 @@ - debug: msg: "PHP-Version: {{php_version}}" +- set_fact: + php_clear_env_available: False + +- set_fact: + php_clear_env_available: True + when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or + ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or + ( php_version | version_compare('5.6', 'ge') ) + - name: Set php pool file set_fact: php_pool_conf: www.conf @@ -76,10 +85,19 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { key: 'clear_env', value: "no" } - when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or - ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or - ( php_version | version_compare('5.6', 'ge') ) + when: php_clear_env_available == True + +- name: Remove clear env workaround + file: + path: "/opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh" + state: absent + when: php_clear_env_available == True +- name: Append clear env workaround in php-fpm pool (old php-fpm versions) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + line: ';#CLEAR_ENV_WORKAROUND#' + when: php_clear_env_available == False - name: Disable php-fpm connection limit lineinfile: diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index b8106b936..e302c49f3 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-14.04/Dockerfile.jinja2 b/docker/php/ubuntu-14.04/Dockerfile.jinja2 index 6befd136b..6a5876d83 100644 --- a/docker/php/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php/ubuntu-14.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..b17280ce6 --- /dev/null +++ b/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,34 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet ";#CLEAR_ENV_WORKAROUND#" "$VARIABLE_LIST" > /dev/null + 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 b88e8db98..da665ebf5 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 @@ -13,6 +13,15 @@ - debug: msg: "PHP-Version: {{php_version}}" +- set_fact: + php_clear_env_available: False + +- set_fact: + php_clear_env_available: True + when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or + ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or + ( php_version | version_compare('5.6', 'ge') ) + - name: Set php pool file set_fact: php_pool_conf: www.conf @@ -76,10 +85,19 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { key: 'clear_env', value: "no" } - when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or - ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or - ( php_version | version_compare('5.6', 'ge') ) + when: php_clear_env_available == True + +- name: Remove clear env workaround + file: + path: "/opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh" + state: absent + when: php_clear_env_available == True +- name: Append clear env workaround in php-fpm pool (old php-fpm versions) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + line: ';#CLEAR_ENV_WORKAROUND#' + when: php_clear_env_available == False - name: Disable php-fpm connection limit lineinfile: diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index 330fcdc73..9f5e539f4 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-15.04/Dockerfile.jinja2 b/docker/php/ubuntu-15.04/Dockerfile.jinja2 index 64739bfd9..647f7ee45 100644 --- a/docker/php/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php/ubuntu-15.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..b17280ce6 --- /dev/null +++ b/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,34 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet ";#CLEAR_ENV_WORKAROUND#" "$VARIABLE_LIST" > /dev/null + 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 b88e8db98..da665ebf5 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 @@ -13,6 +13,15 @@ - debug: msg: "PHP-Version: {{php_version}}" +- set_fact: + php_clear_env_available: False + +- set_fact: + php_clear_env_available: True + when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or + ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or + ( php_version | version_compare('5.6', 'ge') ) + - name: Set php pool file set_fact: php_pool_conf: www.conf @@ -76,10 +85,19 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { key: 'clear_env', value: "no" } - when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or - ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or - ( php_version | version_compare('5.6', 'ge') ) + when: php_clear_env_available == True + +- name: Remove clear env workaround + file: + path: "/opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh" + state: absent + when: php_clear_env_available == True +- name: Append clear env workaround in php-fpm pool (old php-fpm versions) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + line: ';#CLEAR_ENV_WORKAROUND#' + when: php_clear_env_available == False - name: Disable php-fpm connection limit lineinfile: diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index 16caea36b..508826df3 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-15.10/Dockerfile.jinja2 b/docker/php/ubuntu-15.10/Dockerfile.jinja2 index c7a3e9345..01313c4f2 100644 --- a/docker/php/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php/ubuntu-15.10/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..b17280ce6 --- /dev/null +++ b/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,34 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet ";#CLEAR_ENV_WORKAROUND#" "$VARIABLE_LIST" > /dev/null + 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 b88e8db98..da665ebf5 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 @@ -13,6 +13,15 @@ - debug: msg: "PHP-Version: {{php_version}}" +- set_fact: + php_clear_env_available: False + +- set_fact: + php_clear_env_available: True + when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or + ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or + ( php_version | version_compare('5.6', 'ge') ) + - name: Set php pool file set_fact: php_pool_conf: www.conf @@ -76,10 +85,19 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { key: 'clear_env', value: "no" } - when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or - ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or - ( php_version | version_compare('5.6', 'ge') ) + when: php_clear_env_available == True + +- name: Remove clear env workaround + file: + path: "/opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh" + state: absent + when: php_clear_env_available == True +- name: Append clear env workaround in php-fpm pool (old php-fpm versions) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + line: ';#CLEAR_ENV_WORKAROUND#' + when: php_clear_env_available == False - name: Disable php-fpm connection limit lineinfile: diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index c1cd46918..228f91435 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-16.04/Dockerfile.jinja2 b/docker/php/ubuntu-16.04/Dockerfile.jinja2 index d137a84b5..81a28f909 100644 --- a/docker/php/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php/ubuntu-16.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..b17280ce6 --- /dev/null +++ b/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,34 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet ";#CLEAR_ENV_WORKAROUND#" "$VARIABLE_LIST" > /dev/null + diff --git a/docker/piwik/ubuntu-14.04/Dockerfile b/docker/piwik/ubuntu-14.04/Dockerfile index 60bf9c95a..263397732 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 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 c83e708df..4180bbc3d 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 COPY conf/ /opt/docker/ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 175b27a89..6f8c3a224 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ############################################################################### diff --git a/docker/samson-deployment/latest/Dockerfile.jinja2 b/docker/samson-deployment/latest/Dockerfile.jinja2 index 544c2b2be..cc5e6ad50 100644 --- a/docker/samson-deployment/latest/Dockerfile.jinja2 +++ b/docker/samson-deployment/latest/Dockerfile.jinja2 @@ -7,7 +7,7 @@ # Bootstrap ############################################################################### -{{ docker.environmentLang() }} +{{ environment.lang() }} {{ docker.add('baselayout.tar', '/') }} @@ -17,7 +17,7 @@ # Base ############################################################################### -{{ docker.environmentHomePath() }} +{{ environment.homePath() }} {{ docker.copy('conf/', '/opt/docker/') }} @@ -27,7 +27,7 @@ # Base-app ############################################################################### -{{ docker.environmentApp() }} +{{ environment.app() }} {{ baseapp.debian() }} diff --git a/docker/samson-deployment/latest/web/502.html b/docker/samson-deployment/latest/web/502.html index 8c005f149..8a89cfa91 100644 --- a/docker/samson-deployment/latest/web/502.html +++ b/docker/samson-deployment/latest/web/502.html @@ -39,7 +39,7 @@ bottom: 0px; right: 0; - background: url(logo_light.png); + background: url(/logo_light.png); background-attachment: fixed; background-repeat: no-repeat; background-position: top center; diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index c5d75a33b..0b5f09c71 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 RUN /usr/local/bin/apk-install \ # General sphinx diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index fbedc7302..c4ccf9b99 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 RUN /opt/docker/bin/control.sh service.enable ssh diff --git a/docker/storage/latest/Dockerfile b/docker/storage/latest/Dockerfile index d27712751..bb7e65218 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 RUN mkdir /storage/ \ && chmod 777 /storage/ diff --git a/docker/typo3/ubuntu-14.04/Dockerfile b/docker/typo3/ubuntu-14.04/Dockerfile index f17f5b259..794675cb6 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV WEB_DOCUMENT_ROOT /app/web/ diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index 64a55f12a..b5845a717 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV VARNISH_PORT 80 diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index 2e52e369a..18fdb0387 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=7 -LABEL io.webdevops.version=0.50.2 +LABEL io.webdevops.version=0.50.3 ENV FTP_USER application ENV FTP_PASSWORD application diff --git a/docker/vsftp/latest/Dockerfile.jinja2 b/docker/vsftp/latest/Dockerfile.jinja2 index 5e4e1d06d..e4ff22d0b 100644 --- a/docker/vsftp/latest/Dockerfile.jinja2 +++ b/docker/vsftp/latest/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ docker.environmentFtp() }} +{{ environment.ftp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/documentation/docs/content/BuildingProcess/customizing.rst b/documentation/docs/content/BuildingProcess/customizing.rst index e349c4190..e104c3b76 100644 --- a/documentation/docs/content/BuildingProcess/customizing.rst +++ b/documentation/docs/content/BuildingProcess/customizing.rst @@ -8,7 +8,7 @@ Baselayout The ``baselayout`` directory contains a bunch of smaller scripts which will uploaded as tar file into ``webdevops/bootstrap``. -``make provision`` will build these tar files and deploy them to the Dockerfile directories. +``make baselayout`` will build these tar files and deploy them to the Dockerfile directories. Provision --------- @@ -18,6 +18,8 @@ directories. The rules which directory is processed in which order is specified in ``bin/provision.sh``. +``make provision`` will build these files and deploy them to the Dockerfile directories. + Dockerfile.jinja2 and templates ------------------------------- @@ -27,3 +29,5 @@ templates there are macros which are defined inside ``template/`` directory. The script ``bin/buildDockerfile.py`` will search for ``Dockerfile.jinja2`` files, processes them and stores them as ``Dockerfile``. + +``make provision`` will build these files and deploy them to the Dockerfile directories. diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/environment-web-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/include/environment-web-dev.rst new file mode 100644 index 000000000..36773e2df --- /dev/null +++ b/documentation/docs/content/DockerImages/dockerfiles/include/environment-web-dev.rst @@ -0,0 +1,11 @@ +========================== ============================ ============================================== +Environment variable Description Default +========================== ============================ ============================================== +``WEB_DOCUMENT_ROOT`` Document root for webserver ``/app`` +``WEB_DOCUMENT_INDEX`` Index document ``index.php`` +``WEB_ALIAS_DOMAIN`` Domain aliases ``*.vm`` +``WEB_PHP_SOCKET`` PHP-FPM socket address ``127.0.0.1:9000`` (for php-* images) +``WEB_NO_CACHE_PATTERN`` RegExp of files which should ``\.(css|js|gif|png|jpg|svg|json|xml)$`` + be delivered by webserver as + non cacheable to browser +========================== ============================ ============================================== diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/environment-web.rst b/documentation/docs/content/DockerImages/dockerfiles/include/environment-web.rst index 58c293e6f..c178dde0a 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/include/environment-web.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/include/environment-web.rst @@ -1,7 +1,9 @@ -====================== ============================ ============= -Environment variable Description Default -====================== ============================ ============= -``WEB_DOCUMENT_ROOT`` Document root for webserver ``/app`` -``WEB_DOCUMENT_INDEX`` Index document ``index.php`` -``WEB_ALIAS_DOMAIN`` Domain aliases ``*.vm`` -====================== ============================ ============= +========================== ============================ ============================================== +Environment variable Description Default +========================== ============================ ============================================== +``WEB_DOCUMENT_ROOT`` Document root for webserver ``/app`` +``WEB_DOCUMENT_INDEX`` Index document ``index.php`` +``WEB_ALIAS_DOMAIN`` Domain aliases ``*.vm`` +``WEB_PHP_SOCKET`` PHP-FPM socket address ``127.0.0.1:9000`` (for php-* images) +========================== ============================ ============================================== + diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/info-php-development.rst b/documentation/docs/content/DockerImages/dockerfiles/include/info-php-development.rst index 98f3f06db..e5283c72f 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/include/info-php-development.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/include/info-php-development.rst @@ -1 +1,3 @@ .. attention:: PHP is running in development mode. Zend Opcode Cache is set to to revalidate files for best development experience. + +.. tip:: PHP-FPM is accessable by public port 9000 diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst index 71a764f41..de009a1bb 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst @@ -16,7 +16,7 @@ Docker image tags Environment variables --------------------- -.. include:: include/environment-web.rst +.. include:: include/environment-web-dev.rst Docker image layout diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst index 6b18e9f4d..4f86379fe 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst @@ -16,7 +16,7 @@ Docker image tags Environment variables --------------------- -.. include:: include/environment-web.rst +.. include:: include/environment-web-dev.rst Docker image layout diff --git a/provisioning/apache/alpine/etc/httpd/conf.d/10-php.conf b/provisioning/apache/alpine/etc/httpd/conf.d/10-php.conf index b017879ad..b91e36bb9 100644 --- a/provisioning/apache/alpine/etc/httpd/conf.d/10-php.conf +++ b/provisioning/apache/alpine/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ - +> ProxySet connectiontimeout=5 timeout=600 - SetHandler "proxy:fcgi://127.0.0.1:9000" + SetHandler "proxy:fcgi://" diff --git a/provisioning/apache/centos/etc/httpd/conf.d/10-php.conf b/provisioning/apache/centos/etc/httpd/conf.d/10-php.conf index b017879ad..b91e36bb9 100644 --- a/provisioning/apache/centos/etc/httpd/conf.d/10-php.conf +++ b/provisioning/apache/centos/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ - +> ProxySet connectiontimeout=5 timeout=600 - SetHandler "proxy:fcgi://127.0.0.1:9000" + SetHandler "proxy:fcgi://" diff --git a/provisioning/apache/general/bin/service.d/httpd.d/10-init.sh b/provisioning/apache/general/bin/service.d/httpd.d/10-init.sh index f45702d5e..b38dec4fa 100644 --- a/provisioning/apache/general/bin/service.d/httpd.d/10-init.sh +++ b/provisioning/apache/general/bin/service.d/httpd.d/10-init.sh @@ -9,3 +9,11 @@ find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/provisioning/apache/general/etc/httpd/conf.d/10-php.conf b/provisioning/apache/general/etc/httpd/conf.d/10-php.conf index e9f974ca0..3244c4e62 100644 --- a/provisioning/apache/general/etc/httpd/conf.d/10-php.conf +++ b/provisioning/apache/general/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi -FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 600 +FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host -pass-header Authorization -idle-timeout 600 diff --git a/provisioning/nginx/general/bin/service.d/nginx.d/10-init.sh b/provisioning/nginx/general/bin/service.d/nginx.d/10-init.sh index 74a1fa866..656e19f64 100644 --- a/provisioning/nginx/general/bin/service.d/nginx.d/10-init.sh +++ b/provisioning/nginx/general/bin/service.d/nginx.d/10-init.sh @@ -9,3 +9,12 @@ find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "< find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/provisioning/nginx/general/etc/nginx/conf.d/10-php.conf b/provisioning/nginx/general/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/provisioning/nginx/general/etc/nginx/conf.d/10-php.conf +++ b/provisioning/nginx/general/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/provisioning/php-dev/general/bin/service.d/httpd.d/12-development.sh b/provisioning/php-dev/general/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/provisioning/php-dev/general/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/provisioning/php-dev/general/bin/service.d/nginx.d/12-development.sh b/provisioning/php-dev/general/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/provisioning/php-dev/general/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/provisioning/php-dev/general/etc/httpd/vhost.common.d/02-dev.conf b/provisioning/php-dev/general/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/provisioning/php-dev/general/etc/httpd/vhost.common.d/02-dev.conf +++ b/provisioning/php-dev/general/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/provisioning/php-dev/general/etc/nginx/vhost.common.d/02-dev.conf b/provisioning/php-dev/general/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/provisioning/php-dev/general/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/provisioning/php-dev/general/etc/nginx/vhost.common.d/10-location-root.conf b/provisioning/php-dev/general/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/provisioning/php-dev/general/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap 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 c9e0154b7..abf82d989 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 @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { 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) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/provisioning/php/general/bin/service.d/php-fpm.d/11-clear-env.sh b/provisioning/php/general/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..b17280ce6 --- /dev/null +++ b/provisioning/php/general/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,34 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet ";#CLEAR_ENV_WORKAROUND#" "$VARIABLE_LIST" > /dev/null + 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 b88e8db98..da665ebf5 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 @@ -13,6 +13,15 @@ - debug: msg: "PHP-Version: {{php_version}}" +- set_fact: + php_clear_env_available: False + +- set_fact: + php_clear_env_available: True + when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or + ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or + ( php_version | version_compare('5.6', 'ge') ) + - name: Set php pool file set_fact: php_pool_conf: www.conf @@ -76,10 +85,19 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { key: 'clear_env', value: "no" } - when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or - ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or - ( php_version | version_compare('5.6', 'ge') ) + when: php_clear_env_available == True + +- name: Remove clear env workaround + file: + path: "/opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh" + state: absent + when: php_clear_env_available == True +- name: Append clear env workaround in php-fpm pool (old php-fpm versions) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + line: ';#CLEAR_ENV_WORKAROUND#' + when: php_clear_env_available == False - name: Disable php-fpm connection limit lineinfile: diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index 7dfdfb317..cf062e0e6 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -10,46 +10,7 @@ FROM {{ image }}:{{ tag }} MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.2 -{%- endmacro %} - -{% macro environmentLang() -%} -# Ensure UTF-8 -ENV LANG en_US.UTF-8 -ENV LC_ALL en_US.UTF-8 -{%- endmacro %} - -{% macro environmentHomePath() -%} -ENV DOCKER_CONF_HOME /opt/docker/ -{%- endmacro %} - -{% macro environmentMailbox() -%} -ENV MAILBOX_USERNAME "sandbox" -ENV MAILBOX_PASSWORD "mail" -{%- endmacro %} - -{% macro environmentWeb() -%} -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm -{%- endmacro %} - -{% macro environmentFtp() -%} -ENV FTP_USER application -ENV FTP_PASSWORD application -ENV FTP_UID 1000 -ENV FTP_GID 1000 -ENV FTP_PASSWORD dev -ENV FTP_PATH /data/ftp/ -{%- endmacro %} - - -{% macro environmentApp() -%} -ENV APPLICATION_USER application -ENV APPLICATION_GROUP application -ENV APPLICATION_PATH /app -ENV APPLICATION_UID 1000 -ENV APPLICATION_GID 1000 +LABEL io.webdevops.version=0.50.3 {%- endmacro %} {%- macro add(source, target) -%} diff --git a/template/Dockerfile/environment.jinja2 b/template/Dockerfile/environment.jinja2 new file mode 100644 index 000000000..3e99d90f0 --- /dev/null +++ b/template/Dockerfile/environment.jinja2 @@ -0,0 +1,45 @@ +{% macro lang() -%} +# Ensure UTF-8 +ENV LANG en_US.UTF-8 +ENV LC_ALL en_US.UTF-8 +{%- endmacro %} + +{% macro homePath() -%} +ENV DOCKER_CONF_HOME /opt/docker/ +{%- endmacro %} + +{% macro mailbox() -%} +ENV MAILBOX_USERNAME "sandbox" +ENV MAILBOX_PASSWORD "mail" +{%- endmacro %} + +{% macro web() -%} +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm +{%- endmacro %} + +{% macro webPhp() -%} +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +{%- endmacro %} + +{% macro webDevelopment() -%} +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" +{%- endmacro %} + +{% macro ftp() -%} +ENV FTP_USER application +ENV FTP_PASSWORD application +ENV FTP_UID 1000 +ENV FTP_GID 1000 +ENV FTP_PASSWORD dev +ENV FTP_PATH /data/ftp/ +{%- endmacro %} + +{% macro app() -%} +ENV APPLICATION_USER application +ENV APPLICATION_GROUP application +ENV APPLICATION_PATH /app +ENV APPLICATION_UID 1000 +ENV APPLICATION_GID 1000 +{%- endmacro %} diff --git a/template/Dockerfile/layout.jinja2 b/template/Dockerfile/layout.jinja2 index 833913671..0c3023b67 100644 --- a/template/Dockerfile/layout.jinja2 +++ b/template/Dockerfile/layout.jinja2 @@ -1,5 +1,6 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} -{% import 'Dockerfile/provision.jinja2' as provision %} +{% import 'Dockerfile/docker.jinja2' as docker %} +{% import 'Dockerfile/provision.jinja2' as provision %} +{% import 'Dockerfile/environment.jinja2' as environment %} {% import 'Dockerfile/images/bootstrap.jinja2' as bootstrap %} {% import 'Dockerfile/images/base.jinja2' as base %} diff --git a/test/spec/collection/dovecot.rb b/test/spec/collection/dovecot.rb index 47d9279a3..4d7c33bef 100644 --- a/test/spec/collection/dovecot.rb +++ b/test/spec/collection/dovecot.rb @@ -1,4 +1,6 @@ shared_examples 'collection::dovecot' do + include_examples 'dovecot::layout' + # services include_examples 'dovecot::listening::public' diff --git a/test/spec/collection/hhvm.rb b/test/spec/collection/hhvm.rb index 828863d11..47a312900 100644 --- a/test/spec/collection/hhvm.rb +++ b/test/spec/collection/hhvm.rb @@ -1,4 +1,5 @@ shared_examples 'collection::hhvm' do + include_examples 'hhvm::layout' include_examples 'php::cli' include_examples 'hhvm::cli::version' include_examples 'php::cli::test::sha1' diff --git a/test/spec/collection/php5.rb b/test/spec/collection/php5.rb index 495615dcc..a265636a0 100644 --- a/test/spec/collection/php5.rb +++ b/test/spec/collection/php5.rb @@ -1,4 +1,5 @@ shared_examples 'collection::php5' do + include_examples 'php::layout' include_examples 'php::cli' include_examples 'php5::cli::version' include_examples 'php::modules' diff --git a/test/spec/collection/php7.rb b/test/spec/collection/php7.rb index 1153fc3b6..129771a16 100644 --- a/test/spec/collection/php7.rb +++ b/test/spec/collection/php7.rb @@ -1,4 +1,5 @@ shared_examples 'collection::php7' do + include_examples 'php::layout' include_examples 'php::cli' include_examples 'php7::cli::version' include_examples 'php::modules' diff --git a/test/spec/collection/postfix.rb b/test/spec/collection/postfix.rb index 8c1c33c86..c81c8c013 100644 --- a/test/spec/collection/postfix.rb +++ b/test/spec/collection/postfix.rb @@ -1,4 +1,6 @@ shared_examples 'collection::postfix' do + include_examples 'postfix::layout' + # services include_examples 'postfix::listening::public' diff --git a/test/spec/collection/ssh.rb b/test/spec/collection/ssh.rb index 9c8ed5e9d..fd71179a8 100644 --- a/test/spec/collection/ssh.rb +++ b/test/spec/collection/ssh.rb @@ -1,4 +1,6 @@ shared_examples 'collection::ssh' do + include_examples 'ssh::layout' + # services include_examples 'ssh::listening::public' diff --git a/test/spec/collection/vsftp.rb b/test/spec/collection/vsftp.rb index 81fbac703..0912a13ed 100644 --- a/test/spec/collection/vsftp.rb +++ b/test/spec/collection/vsftp.rb @@ -1,4 +1,6 @@ shared_examples 'collection::vsftp' do + include_examples 'vsftp::layout' + # services include_examples 'vsftp::listening::public' diff --git a/test/spec/docker/php5-apache-dev_spec.rb b/test/spec/docker/php5-apache-dev_spec.rb index 053d2bdaf..5061cc7ae 100644 --- a/test/spec/docker/php5-apache-dev_spec.rb +++ b/test/spec/docker/php5-apache-dev_spec.rb @@ -13,7 +13,7 @@ include_examples 'collection::base-app' include_examples 'collection::php5::development' include_examples 'collection::php-fpm5' - include_examples 'collection::php-fpm5::local-only' + include_examples 'collection::php-fpm5::public' include_examples 'collection::php-tools' include_examples 'collection::apache' include_examples 'collection::php-fpm5::webserver-test::development' diff --git a/test/spec/docker/php5-nginx-dev_spec.rb b/test/spec/docker/php5-nginx-dev_spec.rb index 0871c9284..a68e34bd1 100644 --- a/test/spec/docker/php5-nginx-dev_spec.rb +++ b/test/spec/docker/php5-nginx-dev_spec.rb @@ -13,7 +13,7 @@ include_examples 'collection::base-app' include_examples 'collection::php5::development' include_examples 'collection::php-fpm5' - include_examples 'collection::php-fpm5::local-only' + include_examples 'collection::php-fpm5::public' include_examples 'collection::php-tools' include_examples 'collection::nginx' include_examples 'collection::php-fpm5::webserver-test::development' diff --git a/test/spec/docker/php7-apache-dev_spec.rb b/test/spec/docker/php7-apache-dev_spec.rb index 158118b63..499dcc6e6 100644 --- a/test/spec/docker/php7-apache-dev_spec.rb +++ b/test/spec/docker/php7-apache-dev_spec.rb @@ -13,7 +13,7 @@ include_examples 'collection::base-app' include_examples 'collection::php7::development' include_examples 'collection::php-fpm7' - include_examples 'collection::php-fpm7::local-only' + include_examples 'collection::php-fpm7::public' include_examples 'collection::php-tools' include_examples 'collection::apache' include_examples 'collection::php-fpm7::webserver-test::development' diff --git a/test/spec/docker/php7-nginx-dev_spec.rb b/test/spec/docker/php7-nginx-dev_spec.rb index ef08133cc..9838c8b12 100644 --- a/test/spec/docker/php7-nginx-dev_spec.rb +++ b/test/spec/docker/php7-nginx-dev_spec.rb @@ -13,7 +13,7 @@ include_examples 'collection::base-app' include_examples 'collection::php7::development' include_examples 'collection::php-fpm7' - include_examples 'collection::php-fpm7::local-only' + include_examples 'collection::php-fpm7::public' include_examples 'collection::php-tools' include_examples 'collection::nginx' include_examples 'collection::php-fpm7::webserver-test::development' diff --git a/test/spec/shared/apache/layout.rb b/test/spec/shared/apache/layout.rb index 66871624c..24b343e0f 100644 --- a/test/spec/shared/apache/layout.rb +++ b/test/spec/shared/apache/layout.rb @@ -6,6 +6,7 @@ "/opt/docker/etc/httpd", "/opt/docker/etc/httpd/conf.d", "/opt/docker/etc/httpd/vhost.common.d", + "/opt/docker/bin/service.d/httpd.d", ].each do |file| describe file("#{file}") do # Type check @@ -72,6 +73,39 @@ end end + ######################### + ## Files + ######################### + [ + "/opt/docker/bin/service.d/httpd.sh", + "/opt/docker/bin/service.d/httpd.d/10-init.sh", + ].each do |file| + describe file("#{file}") do + # Type check + it { should be_file } + it { should be_executable } + + # Owner test + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + + # Read test + it { should be_readable.by('owner') } + it { should be_readable.by('group') } + it { should be_readable.by('others') } + + # Write test + it { should be_writable.by('owner') } + it { should_not be_writable.by('group') } + it { should_not be_writable.by('others') } + + # Exectuable test + it { should be_executable.by('owner') } + it { should be_executable.by('group') } + it { should be_executable.by('others') } + end + end + ######################### ## SSL (special rights) ######################### diff --git a/test/spec/shared/dovecot/layout.rb b/test/spec/shared/dovecot/layout.rb new file mode 100644 index 000000000..c4e996ed4 --- /dev/null +++ b/test/spec/shared/dovecot/layout.rb @@ -0,0 +1,65 @@ +shared_examples 'dovecot::layout' do + ######################### + ## Directories + ######################### + [ + "/opt/docker/bin/service.d/dovecot.d" + ].each do |file| + describe file("#{file}") do + # Type check + it { should be_directory } + + # Owner test + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + + # Read test + it { should be_readable.by('owner') } + it { should be_readable.by('group') } + it { should be_readable.by('others') } + + # Write test + it { should be_writable.by('owner') } + it { should_not be_writable.by('group') } + it { should_not be_writable.by('others') } + + # Exectuable test + it { should be_executable.by('owner') } + it { should be_executable.by('group') } + it { should be_executable.by('others') } + end + end + + ######################### + ## Files + ######################### + [ + "/opt/docker/bin/service.d/dovecot.sh", + "/opt/docker/bin/service.d/dovecot.d/10-init.sh", + ].each do |file| + describe file("#{file}") do + # Type check + it { should be_file } + it { should be_executable } + + # Owner test + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + + # Read test + it { should be_readable.by('owner') } + it { should be_readable.by('group') } + it { should be_readable.by('others') } + + # Write test + it { should be_writable.by('owner') } + it { should_not be_writable.by('group') } + it { should_not be_writable.by('others') } + + # Exectuable test + it { should be_executable.by('owner') } + it { should be_executable.by('group') } + it { should be_executable.by('others') } + end + end +end diff --git a/test/spec/shared/dovecot/listening.rb b/test/spec/shared/dovecot/listening.rb index d0dd698e2..3f504a5a5 100644 --- a/test/spec/shared/dovecot/listening.rb +++ b/test/spec/shared/dovecot/listening.rb @@ -6,13 +6,4 @@ end end end - - describe port(993) do - it "dovecot should be listening" do - wait_retry 30 do - should be_listening - end - end - end - end diff --git a/test/spec/shared/hhvm/layout.rb b/test/spec/shared/hhvm/layout.rb new file mode 100644 index 000000000..6383930e2 --- /dev/null +++ b/test/spec/shared/hhvm/layout.rb @@ -0,0 +1,65 @@ +shared_examples 'hhvm::layout' do + ######################### + ## Directories + ######################### + [ + "/opt/docker/bin/service.d/hhvm.d" + ].each do |file| + describe file("#{file}") do + # Type check + it { should be_directory } + + # Owner test + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + + # Read test + it { should be_readable.by('owner') } + it { should be_readable.by('group') } + it { should be_readable.by('others') } + + # Write test + it { should be_writable.by('owner') } + it { should_not be_writable.by('group') } + it { should_not be_writable.by('others') } + + # Exectuable test + it { should be_executable.by('owner') } + it { should be_executable.by('group') } + it { should be_executable.by('others') } + end + end + + ######################### + ## Files + ######################### + [ + "/opt/docker/bin/service.d/hhvm.sh", + "/opt/docker/bin/service.d/hhvm.d/10-init.sh", + ].each do |file| + describe file("#{file}") do + # Type check + it { should be_file } + it { should be_executable } + + # Owner test + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + + # Read test + it { should be_readable.by('owner') } + it { should be_readable.by('group') } + it { should be_readable.by('others') } + + # Write test + it { should be_writable.by('owner') } + it { should_not be_writable.by('group') } + it { should_not be_writable.by('others') } + + # Exectuable test + it { should be_executable.by('owner') } + it { should be_executable.by('group') } + it { should be_executable.by('others') } + end + end +end diff --git a/test/spec/shared/nginx/layout.rb b/test/spec/shared/nginx/layout.rb index bad76b484..302d45957 100644 --- a/test/spec/shared/nginx/layout.rb +++ b/test/spec/shared/nginx/layout.rb @@ -6,6 +6,7 @@ "/opt/docker/etc/nginx", "/opt/docker/etc/nginx/conf.d", "/opt/docker/etc/nginx/vhost.common.d", + "/opt/docker/bin/service.d/nginx.d", ].each do |file| describe file("#{file}") do # Type check @@ -68,6 +69,39 @@ end end + ######################### + ## Files + ######################### + [ + "/opt/docker/bin/service.d/nginx.sh", + "/opt/docker/bin/service.d/nginx.d/10-init.sh", + ].each do |file| + describe file("#{file}") do + # Type check + it { should be_file } + it { should be_executable } + + # Owner test + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + + # Read test + it { should be_readable.by('owner') } + it { should be_readable.by('group') } + it { should be_readable.by('others') } + + # Write test + it { should be_writable.by('owner') } + it { should_not be_writable.by('group') } + it { should_not be_writable.by('others') } + + # Exectuable test + it { should be_executable.by('owner') } + it { should be_executable.by('group') } + it { should be_executable.by('others') } + end + end + ######################### ## SSL (special rights) ######################### diff --git a/test/spec/shared/php/layout.rb b/test/spec/shared/php/layout.rb new file mode 100644 index 000000000..5900d7bab --- /dev/null +++ b/test/spec/shared/php/layout.rb @@ -0,0 +1,65 @@ +shared_examples 'php::layout' do + ######################### + ## Directories + ######################### + [ + "/opt/docker/bin/service.d/php-fpm.d" + ].each do |file| + describe file("#{file}") do + # Type check + it { should be_directory } + + # Owner test + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + + # Read test + it { should be_readable.by('owner') } + it { should be_readable.by('group') } + it { should be_readable.by('others') } + + # Write test + it { should be_writable.by('owner') } + it { should_not be_writable.by('group') } + it { should_not be_writable.by('others') } + + # Exectuable test + it { should be_executable.by('owner') } + it { should be_executable.by('group') } + it { should be_executable.by('others') } + end + end + + ######################### + ## Files + ######################### + [ + "/opt/docker/bin/service.d/php-fpm.sh", + "/opt/docker/bin/service.d/php-fpm.d/10-init.sh", + ].each do |file| + describe file("#{file}") do + # Type check + it { should be_file } + it { should be_executable } + + # Owner test + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + + # Read test + it { should be_readable.by('owner') } + it { should be_readable.by('group') } + it { should be_readable.by('others') } + + # Write test + it { should be_writable.by('owner') } + it { should_not be_writable.by('group') } + it { should_not be_writable.by('others') } + + # Exectuable test + it { should be_executable.by('owner') } + it { should be_executable.by('group') } + it { should be_executable.by('others') } + end + end +end diff --git a/test/spec/shared/postfix/layout.rb b/test/spec/shared/postfix/layout.rb new file mode 100644 index 000000000..ee364c147 --- /dev/null +++ b/test/spec/shared/postfix/layout.rb @@ -0,0 +1,65 @@ +shared_examples 'postfix::layout' do + ######################### + ## Directories + ######################### + [ + "/opt/docker/bin/service.d/postfix.d" + ].each do |file| + describe file("#{file}") do + # Type check + it { should be_directory } + + # Owner test + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + + # Read test + it { should be_readable.by('owner') } + it { should be_readable.by('group') } + it { should be_readable.by('others') } + + # Write test + it { should be_writable.by('owner') } + it { should_not be_writable.by('group') } + it { should_not be_writable.by('others') } + + # Exectuable test + it { should be_executable.by('owner') } + it { should be_executable.by('group') } + it { should be_executable.by('others') } + end + end + + ######################### + ## Files + ######################### + [ + "/opt/docker/bin/service.d/postfix.sh", + "/opt/docker/bin/service.d/postfix.d/10-init.sh", + ].each do |file| + describe file("#{file}") do + # Type check + it { should be_file } + it { should be_executable } + + # Owner test + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + + # Read test + it { should be_readable.by('owner') } + it { should be_readable.by('group') } + it { should be_readable.by('others') } + + # Write test + it { should be_writable.by('owner') } + it { should_not be_writable.by('group') } + it { should_not be_writable.by('others') } + + # Exectuable test + it { should be_executable.by('owner') } + it { should be_executable.by('group') } + it { should be_executable.by('others') } + end + end +end diff --git a/test/spec/shared/ssh/layout.rb b/test/spec/shared/ssh/layout.rb new file mode 100644 index 000000000..5084349fe --- /dev/null +++ b/test/spec/shared/ssh/layout.rb @@ -0,0 +1,65 @@ +shared_examples 'ssh::layout' do + ######################### + ## Directories + ######################### + [ + "/opt/docker/bin/service.d/ssh.d" + ].each do |file| + describe file("#{file}") do + # Type check + it { should be_directory } + + # Owner test + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + + # Read test + it { should be_readable.by('owner') } + it { should be_readable.by('group') } + it { should be_readable.by('others') } + + # Write test + it { should be_writable.by('owner') } + it { should_not be_writable.by('group') } + it { should_not be_writable.by('others') } + + # Exectuable test + it { should be_executable.by('owner') } + it { should be_executable.by('group') } + it { should be_executable.by('others') } + end + end + + ######################### + ## Files + ######################### + [ + "/opt/docker/bin/service.d/ssh.sh", + "/opt/docker/bin/service.d/ssh.d/10-init.sh", + ].each do |file| + describe file("#{file}") do + # Type check + it { should be_file } + it { should be_executable } + + # Owner test + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + + # Read test + it { should be_readable.by('owner') } + it { should be_readable.by('group') } + it { should be_readable.by('others') } + + # Write test + it { should be_writable.by('owner') } + it { should_not be_writable.by('group') } + it { should_not be_writable.by('others') } + + # Exectuable test + it { should be_executable.by('owner') } + it { should be_executable.by('group') } + it { should be_executable.by('others') } + end + end +end diff --git a/test/spec/shared/vsftp/layout.rb b/test/spec/shared/vsftp/layout.rb new file mode 100644 index 000000000..09efd31ca --- /dev/null +++ b/test/spec/shared/vsftp/layout.rb @@ -0,0 +1,65 @@ +shared_examples 'vsftp::layout' do + ######################### + ## Directories + ######################### + [ + "/opt/docker/bin/service.d/vsftp.d" + ].each do |file| + describe file("#{file}") do + # Type check + it { should be_directory } + + # Owner test + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + + # Read test + it { should be_readable.by('owner') } + it { should be_readable.by('group') } + it { should be_readable.by('others') } + + # Write test + it { should be_writable.by('owner') } + it { should_not be_writable.by('group') } + it { should_not be_writable.by('others') } + + # Exectuable test + it { should be_executable.by('owner') } + it { should be_executable.by('group') } + it { should be_executable.by('others') } + end + end + + ######################### + ## Files + ######################### + [ + "/opt/docker/bin/service.d/vsftp.sh", + "/opt/docker/bin/service.d/vsftp.d/10-init.sh", + ].each do |file| + describe file("#{file}") do + # Type check + it { should be_file } + it { should be_executable } + + # Owner test + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + + # Read test + it { should be_readable.by('owner') } + it { should be_readable.by('group') } + it { should be_readable.by('others') } + + # Write test + it { should be_writable.by('owner') } + it { should_not be_writable.by('group') } + it { should_not be_writable.by('others') } + + # Exectuable test + it { should be_executable.by('owner') } + it { should be_executable.by('group') } + it { should be_executable.by('others') } + end + end +end