diff --git a/CHANGELOG.md b/CHANGELOG.md index bc18e0994..326e081e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/D ## [1.0.0] - upcoming +## [0.53.0] - 2016-06-23 +- Added apache-dev and nginx-dev +- Restructed php-*dev provision +- Removed whoami call +- Removed provision from `make all` and `make build` +- Removed --force from apk-install +- Fixed pecl for alpine images +- Updated documentation and tests + ## [0.52.0] - 2016-06-20 - Added tag centos-7-php56 for php images - Added POSTFIX_MYNETWORKS and POSTFIX_RELAYHOST environment variables diff --git a/Makefile b/Makefile index c9150cfbb..f27826cb3 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,9 @@ DOCKER_TAG_LATEST=`cat DOCKER_TAG_LATEST` list: sh -c "echo; $(MAKE) -p no_targets__ | awk -F':' '/^[a-zA-Z0-9][^\$$#\\t=]*:([^=]|$$)/ {split(\$$1,A,/ /);for(i in A)print A[i]}' | grep -v '__\$$' | grep -v 'Makefile'| sort" -all: provision bootstrap base web php php-dev hhvm service misc applications -build: all +full: provision build +all: build +build: bootstrap base web php php-dev hhvm service misc applications bootstrap: webdevops/bootstrap webdevops/ansible base: webdevops/base webdevops/base-app webdevops/storage @@ -19,7 +20,7 @@ php: webdevops/php webdevops/php-apache webdevops/php-nginx php-dev: webdevops/php-dev webdevops/php-apache-dev webdevops/php-nginx-dev hhvm: webdevops/hhvm webdevops/hhvm-apache webdevops/hhvm-nginx -web: webdevops/apache webdevops/nginx webdevops/varnish +web: webdevops/apache webdevops/apache-dev webdevops/nginx webdevops/nginx-dev webdevops/varnish applications: webdevops/typo3 webdevops/piwik @@ -99,9 +100,15 @@ webdevops/php-dev: webdevops/apache: bash bin/build.sh apache "${DOCKER_REPOSITORY}/apache" "${DOCKER_TAG_LATEST}" +webdevops/apache-dev: + bash bin/build.sh apache-dev "${DOCKER_REPOSITORY}/apache-dev" "${DOCKER_TAG_LATEST}" + webdevops/nginx: bash bin/build.sh nginx "${DOCKER_REPOSITORY}/nginx" "${DOCKER_TAG_LATEST}" +webdevops/nginx-dev: + bash bin/build.sh nginx-dev "${DOCKER_REPOSITORY}/nginx-dev" "${DOCKER_TAG_LATEST}" + webdevops/php-apache: bash bin/build.sh php-apache "${DOCKER_REPOSITORY}/php-apache" "${DOCKER_TAG_LATEST}" diff --git a/README.md b/README.md index 16c3ea722..8f343e2c2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# WebDevOps Dockerfiles +![Dockerfile](https://static.webdevops.io/dockerfile.svg) -Dockerfiles for various prebuilt docker containers +Automated built and tested on [WebDevOps Build server](https://build.webdevops.io/) sponsored by [](http://infogene.fr/) [![Docker layout](documentation/docs/resources/images/docker-image-layout.gv.png)](documentation/docs/resources/images/docker-image-layout.gv.png) @@ -38,6 +38,7 @@ Command | Description `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) +`make full` | Run provision and build all images
| `make test` | Run testsuite (use currently available docker images on your docker host) `make test-hub-images` | Run testsuite but pull newest docker images from docker hub first diff --git a/baselayout/usr/local/bin/apk-install b/baselayout/usr/local/bin/apk-install index e0458b31a..cbcedca6e 100755 --- a/baselayout/usr/local/bin/apk-install +++ b/baselayout/usr/local/bin/apk-install @@ -7,7 +7,7 @@ set -o errexit ## set -e : exit the script if any statement returns a non-true apk update # Install packages -apk add --upgrade --force $* +apk add --upgrade $* # Clear files (reduce snapshot size) rm -rf var/cache/apk/* diff --git a/bin/provision.sh b/bin/provision.sh index ef6625ed2..398674ff7 100755 --- a/bin/provision.sh +++ b/bin/provision.sh @@ -254,6 +254,13 @@ function header() { deployConfiguration apache/alpine apache 'alpine-*' } +## Build apache-dev +[[ $(checkBuildTarget apache-dev) ]] && { + header "apache-dev" + clearConfiguration apache-dev '*' + deployConfiguration apache-dev/general apache-dev '*' +} + ## Build nginx [[ $(checkBuildTarget nginx) ]] && { header "nginx" @@ -263,6 +270,13 @@ function header() { deployConfiguration nginx/alpine nginx 'alpine-*' } +## Build nginx-dev +[[ $(checkBuildTarget nginx) ]] && { + header "nginx-dev" + clearConfiguration nginx-dev '*' + deployConfiguration nginx-dev/general nginx-dev '*' +} + ## Build hhvm [[ $(checkBuildTarget hhvm) ]] && { header "hhvm" @@ -338,6 +352,7 @@ function header() { deployConfiguration apache/alpine php-apache-dev 'alpine-*' deployConfiguration php-apache/general php-apache-dev '*' deployConfiguration php-dev/general php-apache-dev '*' + deployConfiguration apache-dev/general php-apache-dev '*' } ## Build php-nginx-dev @@ -349,6 +364,7 @@ function header() { deployConfiguration nginx/alpine php-nginx-dev 'alpine-*' deployConfiguration php-nginx/general php-nginx-dev '*' deployConfiguration php-dev/general php-nginx-dev '*' + deployConfiguration nginx-dev/general php-nginx-dev '*' } ## Build postfix diff --git a/docker/ansible/alpine-3/Dockerfile b/docker/ansible/alpine-3/Dockerfile index b48ef9a30..60e832753 100644 --- a/docker/ansible/alpine-3/Dockerfile +++ b/docker/ansible/alpine-3/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index 126b4dda5..6e0b42c4c 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index 9717f76e7..ca797b19e 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index 347296936..f9af8c944 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index d560995aa..6153e7fc3 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index e7a86ad01..1a81117cf 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index ee8bdc7fc..418d3ef28 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index 6f593c1e0..205a37cfb 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index 75a2b05c7..bd68a6feb 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index 67ff32201..ea2e82bf7 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 diff --git a/docker/apache-dev/README.md b/docker/apache-dev/README.md new file mode 100644 index 000000000..a69490f05 --- /dev/null +++ b/docker/apache-dev/README.md @@ -0,0 +1,44 @@ +# Apache webserver Docker container + +Automated build and tested by [WebDevOps Build Server](https://build.webdevops.io/) + +## Environment variables + +Variable | Description +---------------------- | ------------------------------------------------------------------------------ +`CLI_SCRIPT` | Predefined CLI script for service +`APPLICATION_UID` | PHP-FPM UID (Effective user ID) +`APPLICATION_GID` | PHP-FPM GID (Effective group ID) +`WEB_DOCUMENT_ROOT` | Document root for Apache HTTPD +`WEB_DOCUMENT_INDEX` | Document index (eg. `index.php`) for Apache HTTPD +`WEB_ALIAS_DOMAIN` | Alias domains (eg. `*.vm`) for Apache HTTPD + +## Filesystem layout + +Directory | Description +------------------------------- | ------------------------------------------------------------------------------ +`/opt/docker/etc/httpd` | Apache configuration +`/opt/docker/etc/httpd/ssl` | Apache ssl configuration with example server.crt, server.csr, server.key + +File | Description +--------------------------------------------- | ------------------------------------------------------------------------------ +`/opt/docker/etc/httpd/main.conf` | Main include file (will include `global.conf`, `php.conf` and `vhost.conf`) +`/opt/docker/etc/httpd/global.conf` | Global apache configuration options +`/opt/docker/etc/httpd/conf.d/*.conf` | Global apache configuration directory (will be included) +`/opt/docker/etc/httpd/php.conf` | PHP configuration (connection to FPM) +`/opt/docker/etc/httpd/vhost.common.d/*.conf` | Vhost common directory (will be included) +`/opt/docker/etc/httpd/vhost.conf` | Default vhost +`/opt/docker/etc/httpd/vhost.ssl.conf` | Default ssl configuration for vhost + + +## Container info + +Image | Info +----------------------------------- | ---------------------------------------------------------------------------------- +webdevops/apache:latest | [![](https://badge.imagelayers.io/webdevops/apache:latest.svg)](https://imagelayers.io/?images=webdevops/apache:latest 'Get your own badge on imagelayers.io') +webdevops/apache:ubuntu-14.04 | [![](https://badge.imagelayers.io/webdevops/apache:ubuntu-14.04.svg)](https://imagelayers.io/?images=webdevops/apache:ubuntu-14.04 'Get your own badge on imagelayers.io') +webdevops/apache:ubuntu-15.04 | [![](https://badge.imagelayers.io/webdevops/apache:ubuntu-15.04.svg)](https://imagelayers.io/?images=webdevops/apache:ubuntu-15.04 'Get your own badge on imagelayers.io') +webdevops/apache:ubuntu-15.10 | [![](https://badge.imagelayers.io/webdevops/apache:ubuntu-15.10.svg)](https://imagelayers.io/?images=webdevops/apache:ubuntu-15.14 'Get your own badge on imagelayers.io') +webdevops/apache:centos-7 | [![](https://badge.imagelayers.io/webdevops/apache:centos-7.svg)](https://imagelayers.io/?images=webdevops/apache:centos-7 'Get your own badge on imagelayers.io') +webdevops/apache:debian-7 | [![](https://badge.imagelayers.io/webdevops/apache:debian-7.svg)](https://imagelayers.io/?images=webdevops/apache:debian-7 'Get your own badge on imagelayers.io') +webdevops/apache:debian-8 | [![](https://badge.imagelayers.io/webdevops/apache:debian-8.svg)](https://imagelayers.io/?images=webdevops/apache:debian-8 'Get your own badge on imagelayers.io') diff --git a/docker/apache-dev/alpine-3/Dockerfile b/docker/apache-dev/alpine-3/Dockerfile new file mode 100644 index 000000000..97f7a1a07 --- /dev/null +++ b/docker/apache-dev/alpine-3/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/apache-dev:alpine-3 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/apache:alpine-3 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.53.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN echo \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/apache-dev/alpine-3/Dockerfile.jinja2 b/docker/apache-dev/alpine-3/Dockerfile.jinja2 new file mode 100644 index 000000000..4f8c82060 --- /dev/null +++ b/docker/apache-dev/alpine-3/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("apache", "alpine-3") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ apachedev.general() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh rename to docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh diff --git a/docker/php-dev/alpine-3-php7/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/alpine-3/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/etc/httpd/conf.d/02-dev.conf rename to docker/apache-dev/alpine-3/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/php-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/main.yml diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile new file mode 100644 index 000000000..1bb965226 --- /dev/null +++ b/docker/apache-dev/centos-7/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/apache-dev:centos-7 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/apache:centos-7 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.53.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN echo \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/apache-dev/centos-7/Dockerfile.jinja2 b/docker/apache-dev/centos-7/Dockerfile.jinja2 new file mode 100644 index 000000000..2df2e82e9 --- /dev/null +++ b/docker/apache-dev/centos-7/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("apache", "centos-7") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ apachedev.general() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh similarity index 100% rename from docker/php-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh rename to docker/apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh diff --git a/docker/php-dev/alpine-3/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/php-dev/alpine-3/conf/etc/httpd/conf.d/02-dev.conf rename to docker/apache-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/php-apache-dev/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/apache-dev/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/apache-dev/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/php-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/apache-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile new file mode 100644 index 000000000..a93fa0d4f --- /dev/null +++ b/docker/apache-dev/debian-7/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/apache-dev:debian-7 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/apache:debian-7 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.53.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN echo \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/apache-dev/debian-7/Dockerfile.jinja2 b/docker/apache-dev/debian-7/Dockerfile.jinja2 new file mode 100644 index 000000000..170f1fd82 --- /dev/null +++ b/docker/apache-dev/debian-7/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("apache", "debian-7") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ apachedev.general() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh similarity index 100% rename from docker/php-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh rename to docker/apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh diff --git a/docker/php-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/php-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf rename to docker/apache-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/apache-dev/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/apache-dev/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/php-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/apache-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile new file mode 100644 index 000000000..bb9af5d5a --- /dev/null +++ b/docker/apache-dev/debian-8/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/apache-dev:debian-8 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/apache:debian-8 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.53.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN echo \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/apache-dev/debian-8/Dockerfile.jinja2 b/docker/apache-dev/debian-8/Dockerfile.jinja2 new file mode 100644 index 000000000..417d75e1e --- /dev/null +++ b/docker/apache-dev/debian-8/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("apache", "debian-8") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ apachedev.general() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh similarity index 100% rename from docker/php-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh rename to docker/apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh diff --git a/docker/php-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/php-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf rename to docker/apache-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/php-apache-dev/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/apache-dev/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-apache-dev/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/apache-dev/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/php-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/apache-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/main.yml diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile new file mode 100644 index 000000000..9bd49d309 --- /dev/null +++ b/docker/apache-dev/debian-9/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/apache-dev:debian-9 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/apache:debian-9 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.53.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN echo \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/apache-dev/debian-9/Dockerfile.jinja2 b/docker/apache-dev/debian-9/Dockerfile.jinja2 new file mode 100644 index 000000000..703871b7e --- /dev/null +++ b/docker/apache-dev/debian-9/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("apache", "debian-9") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ apachedev.general() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh similarity index 100% rename from docker/php-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh rename to docker/apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh diff --git a/docker/php-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/php-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf rename to docker/apache-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/php-apache-dev/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/apache-dev/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-apache-dev/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/apache-dev/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/php-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/apache-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/main.yml diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile new file mode 100644 index 000000000..db0754375 --- /dev/null +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/apache-dev:ubuntu-12.04 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/apache:ubuntu-12.04 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.53.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN echo \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 new file mode 100644 index 000000000..1ebf21f16 --- /dev/null +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("apache", "ubuntu-12.04") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ apachedev.general() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh similarity index 100% rename from docker/php-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh rename to docker/apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh diff --git a/docker/php-dev/debian-8-php7/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/php-dev/debian-8-php7/conf/etc/httpd/conf.d/02-dev.conf rename to docker/apache-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/php-apache-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-apache-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/php-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile new file mode 100644 index 000000000..45b0d4601 --- /dev/null +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/apache-dev:ubuntu-14.04 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/apache:ubuntu-14.04 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.53.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN echo \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 new file mode 100644 index 000000000..640029ebe --- /dev/null +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("apache", "ubuntu-14.04") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ apachedev.general() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh similarity index 100% rename from docker/php-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh rename to docker/apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh diff --git a/docker/php-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/php-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf rename to docker/apache-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/php-apache-dev/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-apache-dev/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/php-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile new file mode 100644 index 000000000..a722fdeda --- /dev/null +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/apache-dev:ubuntu-15.04 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/apache:ubuntu-15.04 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.53.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN echo \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 new file mode 100644 index 000000000..9dc653089 --- /dev/null +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("apache", "ubuntu-15.04") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ apachedev.general() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh similarity index 100% rename from docker/php-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh rename to docker/apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh diff --git a/docker/php-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/php-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf rename to docker/apache-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/php-apache-dev/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-apache-dev/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/php-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile new file mode 100644 index 000000000..216172f4f --- /dev/null +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/apache-dev:ubuntu-15.10 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/apache:ubuntu-15.10 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.53.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN echo \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 new file mode 100644 index 000000000..20742a279 --- /dev/null +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("apache", "ubuntu-15.10") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ apachedev.general() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh similarity index 100% rename from docker/php-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh rename to docker/apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh diff --git a/docker/php-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/php-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf rename to docker/apache-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-apache-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/php-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/main.yml diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile new file mode 100644 index 000000000..592bbc7e1 --- /dev/null +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/apache-dev:ubuntu-16.04 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/apache:ubuntu-16.04 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.53.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN echo \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 new file mode 100644 index 000000000..248fcb5ad --- /dev/null +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("apache", "ubuntu-16.04") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ apachedev.general() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh similarity index 100% rename from docker/php-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh rename to docker/apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh diff --git a/docker/php-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/php-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf rename to docker/apache-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-apache-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/php-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml diff --git a/docker/apache/alpine-3/Dockerfile b/docker/apache/alpine-3/Dockerfile index aef7b0433..f1bb9cd4e 100644 --- a/docker/apache/alpine-3/Dockerfile +++ b/docker/apache/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index 61dd2886e..e012ac6b4 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index 3d6cf4c66..d5c13fb47 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index e2e328f30..a5ae5d5e9 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index 921b6bc65..507ed9aa3 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index 240511ede..b19989a7d 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index 360453c71..fbdabbbeb 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index b4658cb76..991794957 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index c1d00786d..2fab8495f 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index 7384816ae..b2fe284ea 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/base-app/alpine-3/Dockerfile b/docker/base-app/alpine-3/Dockerfile index 034264a0a..23d870ff2 100644 --- a/docker/base-app/alpine-3/Dockerfile +++ b/docker/base-app/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index 5f223b9eb..bfe1a4f94 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index 236d639c7..357ee82f1 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index 11d1b1d14..22e741588 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index 9aea4e5f5..757bf3960 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index 39e01645a..5d548bf8a 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index ed365b422..6e5e92733 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index 645631828..009ef4ba5 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index 60c62fb5b..fd741083c 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index 4f9681ee0..36fe35604 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile index ef0bb2181..1eb43e044 100644 --- a/docker/base/alpine-3/Dockerfile +++ b/docker/base/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/alpine-3/conf/bin/entrypoint.sh b/docker/base/alpine-3/conf/bin/entrypoint.sh index f489687f5..b8a179e38 100644 --- a/docker/base/alpine-3/conf/bin/entrypoint.sh +++ b/docker/base/alpine-3/conf/bin/entrypoint.sh @@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh -if [ "$(/usr/bin/whoami)" == "root" ]; then +if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 132708f9e..ab0cc0255 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/centos-7/conf/bin/entrypoint.sh b/docker/base/centos-7/conf/bin/entrypoint.sh index f489687f5..b8a179e38 100644 --- a/docker/base/centos-7/conf/bin/entrypoint.sh +++ b/docker/base/centos-7/conf/bin/entrypoint.sh @@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh -if [ "$(/usr/bin/whoami)" == "root" ]; then +if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index 1ce51491d..c3c164a8c 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-7/conf/bin/entrypoint.sh b/docker/base/debian-7/conf/bin/entrypoint.sh index f489687f5..b8a179e38 100644 --- a/docker/base/debian-7/conf/bin/entrypoint.sh +++ b/docker/base/debian-7/conf/bin/entrypoint.sh @@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh -if [ "$(/usr/bin/whoami)" == "root" ]; then +if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 1a951ac37..54d717676 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-8/conf/bin/entrypoint.sh b/docker/base/debian-8/conf/bin/entrypoint.sh index f489687f5..b8a179e38 100644 --- a/docker/base/debian-8/conf/bin/entrypoint.sh +++ b/docker/base/debian-8/conf/bin/entrypoint.sh @@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh -if [ "$(/usr/bin/whoami)" == "root" ]; then +if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index a855f3d34..5feba82f2 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-9/conf/bin/entrypoint.sh b/docker/base/debian-9/conf/bin/entrypoint.sh index f489687f5..b8a179e38 100644 --- a/docker/base/debian-9/conf/bin/entrypoint.sh +++ b/docker/base/debian-9/conf/bin/entrypoint.sh @@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh -if [ "$(/usr/bin/whoami)" == "root" ]; then +if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 423bfb265..31b10a0e5 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh index f489687f5..b8a179e38 100644 --- a/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh @@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh -if [ "$(/usr/bin/whoami)" == "root" ]; then +if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index c59d71fcb..f8c7e6c87 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh index f489687f5..b8a179e38 100644 --- a/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh @@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh -if [ "$(/usr/bin/whoami)" == "root" ]; then +if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 52877fb67..c58a11192 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh index f489687f5..b8a179e38 100644 --- a/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh @@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh -if [ "$(/usr/bin/whoami)" == "root" ]; then +if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index eb49e23c2..1e686c680 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh b/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh index f489687f5..b8a179e38 100644 --- a/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh @@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh -if [ "$(/usr/bin/whoami)" == "root" ]; then +if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index ec73b3f51..5e3ac78c8 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh index f489687f5..b8a179e38 100644 --- a/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh @@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh -if [ "$(/usr/bin/whoami)" == "root" ]; then +if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index e8e64e8c2..1b1283342 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=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/alpine-3/baselayout.tar b/docker/bootstrap/alpine-3/baselayout.tar index 42188128a..cd19b173e 100644 Binary files a/docker/bootstrap/alpine-3/baselayout.tar and b/docker/bootstrap/alpine-3/baselayout.tar differ diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index d2e1636bc..11a78d6bd 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM centos:7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/centos-7/baselayout.tar b/docker/bootstrap/centos-7/baselayout.tar index 42188128a..cd19b173e 100644 Binary files a/docker/bootstrap/centos-7/baselayout.tar and b/docker/bootstrap/centos-7/baselayout.tar differ diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index c7d91fe9c..1cbf0ae7a 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM debian:7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-7/baselayout.tar b/docker/bootstrap/debian-7/baselayout.tar index 42188128a..cd19b173e 100644 Binary files a/docker/bootstrap/debian-7/baselayout.tar and b/docker/bootstrap/debian-7/baselayout.tar differ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 27c67f3cc..7ecde3dcb 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM debian:8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-8/baselayout.tar b/docker/bootstrap/debian-8/baselayout.tar index 42188128a..cd19b173e 100644 Binary files a/docker/bootstrap/debian-8/baselayout.tar and b/docker/bootstrap/debian-8/baselayout.tar differ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 33ab007f2..028563795 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM debian:stretch MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-9/baselayout.tar b/docker/bootstrap/debian-9/baselayout.tar index 42188128a..cd19b173e 100644 Binary files a/docker/bootstrap/debian-9/baselayout.tar and b/docker/bootstrap/debian-9/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index c006acba9..8bf4811e5 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-12.04/baselayout.tar b/docker/bootstrap/ubuntu-12.04/baselayout.tar index 42188128a..cd19b173e 100644 Binary files a/docker/bootstrap/ubuntu-12.04/baselayout.tar and b/docker/bootstrap/ubuntu-12.04/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 0d98a4ba8..84b05a297 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-14.04/baselayout.tar b/docker/bootstrap/ubuntu-14.04/baselayout.tar index 42188128a..cd19b173e 100644 Binary files a/docker/bootstrap/ubuntu-14.04/baselayout.tar and b/docker/bootstrap/ubuntu-14.04/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 4b8d36db3..7377826e8 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-15.04/baselayout.tar b/docker/bootstrap/ubuntu-15.04/baselayout.tar index 42188128a..cd19b173e 100644 Binary files a/docker/bootstrap/ubuntu-15.04/baselayout.tar and b/docker/bootstrap/ubuntu-15.04/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 52a173165..d24a0c26d 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-15.10/baselayout.tar b/docker/bootstrap/ubuntu-15.10/baselayout.tar index 42188128a..cd19b173e 100644 Binary files a/docker/bootstrap/ubuntu-15.10/baselayout.tar and b/docker/bootstrap/ubuntu-15.10/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index b23e927ea..ff464ce88 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-16.04/baselayout.tar b/docker/bootstrap/ubuntu-16.04/baselayout.tar index 42188128a..cd19b173e 100644 Binary files a/docker/bootstrap/ubuntu-16.04/baselayout.tar and b/docker/bootstrap/ubuntu-16.04/baselayout.tar differ diff --git a/docker/hhvm-apache/ubuntu-14.04/Dockerfile b/docker/hhvm-apache/ubuntu-14.04/Dockerfile index f588a7779..72af9a209 100644 --- a/docker/hhvm-apache/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm-apache/ubuntu-16.04/Dockerfile b/docker/hhvm-apache/ubuntu-16.04/Dockerfile index bc08cd21f..966ae3c17 100644 --- a/docker/hhvm-apache/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile index b25debc11..0c2da55a9 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile index 4bb7d54b2..4d427e506 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm/ubuntu-14.04/Dockerfile b/docker/hhvm/ubuntu-14.04/Dockerfile index c88686ab3..79db787ad 100644 --- a/docker/hhvm/ubuntu-14.04/Dockerfile +++ b/docker/hhvm/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm/ubuntu-16.04/Dockerfile b/docker/hhvm/ubuntu-16.04/Dockerfile index 02081d7ce..45c0a55a3 100644 --- a/docker/hhvm/ubuntu-16.04/Dockerfile +++ b/docker/hhvm/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index a3511e19e..80806aeca 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/postfix:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV MAILBOX_USERNAME "sandbox" ENV MAILBOX_PASSWORD "mail" diff --git a/docker/nginx-dev/README.md b/docker/nginx-dev/README.md new file mode 100644 index 000000000..5e192e900 --- /dev/null +++ b/docker/nginx-dev/README.md @@ -0,0 +1,55 @@ +# Nginx webserver Docker container + +Automated build and tested by [WebDevOps Build Server](https://build.webdevops.io/) + +Container | Distribution name +----------------------------------- | ------------------- +`webdevops/nginx:ubuntu-12.04` | precise +`webdevops/nginx:ubuntu-14.04` | trusty (LTS) +`webdevops/nginx:ubuntu-15.04` | vivid +`webdevops/nginx:ubuntu-15.10` | wily +`webdevops/nginx:debian-7` | wheezy +`webdevops/nginx:debian-8` | jessie +`webdevops/nginx:centos-7` | + + +## Environment variables + +Variable | Description +---------------------- | ------------------------------------------------------------------------------ +`CLI_SCRIPT` | Predefined CLI script for service +`APPLICATION_UID` | PHP-FPM UID (Effective user ID) +`APPLICATION_GID` | PHP-FPM GID (Effective group ID) +`WEB_DOCUMENT_ROOT` | Document root for Nginx +`WEB_DOCUMENT_INDEX` | Document index (eg. `index.php`) for Nginx +`WEB_ALIAS_DOMAIN` | Alias domains (eg. `*.vm`) for Nginx + +## Filesystem layout + +Directory | Description +------------------------------- | ------------------------------------------------------------------------------ +`/opt/docker/etc/nginx` | Nginx configuration +`/opt/docker/etc/nginx/ssl` | Nginx ssl configuration with example server.crt, server.csr, server.key + +File | Description +--------------------------------------------- | ------------------------------------------------------------------------------ +`/opt/docker/etc/nginx/main.conf` | Main include file (will include `global.conf`, `php.conf` and `vhost.conf`) +`/opt/docker/etc/nginx/global.conf` | Global nginx configuration options +`/opt/docker/etc/nginx/conf.d/*.conf` | Global apache configuration directory (will be included) +`/opt/docker/etc/nginx/php.conf` | PHP configuration (connection to FPM) +`/opt/docker/etc/httpd/vhost.common.d/*.conf` | Vhost common directory (will be included) +`/opt/docker/etc/nginx/vhost.conf` | Default vhost +`/opt/docker/etc/nginx/vhost.ssl.conf` | Default ssl configuration for vhost + + +## Container info + +Image | Info +----------------------------------- | ---------------------------------------------------------------------------------- +webdevops/nginx:latest | [![](https://badge.imagelayers.io/webdevops/nginx:latest.svg)](https://imagelayers.io/?images=webdevops/nginx:latest 'Get your own badge on imagelayers.io') +webdevops/nginx:ubuntu-14.04 | [![](https://badge.imagelayers.io/webdevops/nginx:ubuntu-14.04.svg)](https://imagelayers.io/?images=webdevops/nginx:ubuntu-14.04 'Get your own badge on imagelayers.io') +webdevops/nginx:ubuntu-15.04 | [![](https://badge.imagelayers.io/webdevops/nginx:ubuntu-15.04.svg)](https://imagelayers.io/?images=webdevops/nginx:ubuntu-15.04 'Get your own badge on imagelayers.io') +webdevops/nginx:ubuntu-15.10 | [![](https://badge.imagelayers.io/webdevops/nginx:ubuntu-15.10.svg)](https://imagelayers.io/?images=webdevops/nginx:ubuntu-15.14 'Get your own badge on imagelayers.io') +webdevops/nginx:centos-7 | [![](https://badge.imagelayers.io/webdevops/nginx:centos-7.svg)](https://imagelayers.io/?images=webdevops/nginx:centos-7 'Get your own badge on imagelayers.io') +webdevops/nginx:debian-7 | [![](https://badge.imagelayers.io/webdevops/nginx:debian-7.svg)](https://imagelayers.io/?images=webdevops/nginx:debian-7 'Get your own badge on imagelayers.io') +webdevops/nginx:debian-8 | [![](https://badge.imagelayers.io/webdevops/nginx:debian-8.svg)](https://imagelayers.io/?images=webdevops/nginx:debian-8 'Get your own badge on imagelayers.io') diff --git a/docker/nginx-dev/alpine-3/Dockerfile b/docker/nginx-dev/alpine-3/Dockerfile new file mode 100644 index 000000000..5eafaf5ef --- /dev/null +++ b/docker/nginx-dev/alpine-3/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/nginx-dev:alpine-3 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/nginx:alpine-3 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.53.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN echo \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/nginx-dev/alpine-3/Dockerfile.jinja2 b/docker/nginx-dev/alpine-3/Dockerfile.jinja2 new file mode 100644 index 000000000..344d02a74 --- /dev/null +++ b/docker/nginx-dev/alpine-3/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("nginx", "alpine-3") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ nginxdev.general() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh rename to docker/nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/alpine-3/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/nginx/conf.d/02-dev.conf rename to docker/nginx-dev/alpine-3/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-apache-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml similarity index 52% rename from docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml rename to docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml index de7e76c72..3e783736c 100644 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -1,4 +1,3 @@ --- - 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/nginx.yml b/docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml diff --git a/docker/nginx-dev/centos-7/Dockerfile b/docker/nginx-dev/centos-7/Dockerfile new file mode 100644 index 000000000..0e92082dd --- /dev/null +++ b/docker/nginx-dev/centos-7/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/nginx-dev:centos-7 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/nginx:centos-7 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.53.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN echo \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/nginx-dev/centos-7/Dockerfile.jinja2 b/docker/nginx-dev/centos-7/Dockerfile.jinja2 new file mode 100644 index 000000000..8cb9dab6c --- /dev/null +++ b/docker/nginx-dev/centos-7/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("nginx", "centos-7") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ nginxdev.general() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh rename to docker/nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh diff --git a/docker/php-apache-dev/alpine-3/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/nginx/conf.d/02-dev.conf rename to docker/nginx-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/php-apache-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml similarity index 52% rename from docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml rename to docker/nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml index de7e76c72..3e783736c 100644 --- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -1,4 +1,3 @@ --- - 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/nginx.yml b/docker/nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml diff --git a/docker/nginx-dev/debian-7/Dockerfile b/docker/nginx-dev/debian-7/Dockerfile new file mode 100644 index 000000000..24066d52f --- /dev/null +++ b/docker/nginx-dev/debian-7/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/nginx-dev:debian-7 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/nginx:debian-7 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.53.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN echo \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/nginx-dev/debian-7/Dockerfile.jinja2 b/docker/nginx-dev/debian-7/Dockerfile.jinja2 new file mode 100644 index 000000000..9709b08fb --- /dev/null +++ b/docker/nginx-dev/debian-7/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("nginx", "debian-7") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ nginxdev.general() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh similarity index 100% rename from docker/php-apache-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh rename to docker/nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf rename to docker/nginx-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml similarity index 52% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml rename to docker/nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml index de7e76c72..3e783736c 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -1,4 +1,3 @@ --- - include: bootstrap/nginx.yml -- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml diff --git a/docker/nginx-dev/debian-8/Dockerfile b/docker/nginx-dev/debian-8/Dockerfile new file mode 100644 index 000000000..550862f32 --- /dev/null +++ b/docker/nginx-dev/debian-8/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/nginx-dev:debian-8 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/nginx:debian-8 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.53.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN echo \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/nginx-dev/debian-8/Dockerfile.jinja2 b/docker/nginx-dev/debian-8/Dockerfile.jinja2 new file mode 100644 index 000000000..363713e03 --- /dev/null +++ b/docker/nginx-dev/debian-8/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("nginx", "debian-8") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ nginxdev.general() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh similarity index 100% rename from docker/php-apache-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh rename to docker/nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh diff --git a/docker/php-apache-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf rename to docker/nginx-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/php-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/php-apache-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml similarity index 52% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml rename to docker/nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml index de7e76c72..3e783736c 100644 --- a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -1,4 +1,3 @@ --- - 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/nginx.yml b/docker/nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml diff --git a/docker/nginx-dev/debian-9/Dockerfile b/docker/nginx-dev/debian-9/Dockerfile new file mode 100644 index 000000000..3efd710d8 --- /dev/null +++ b/docker/nginx-dev/debian-9/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/nginx-dev:debian-9 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/nginx:debian-9 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.53.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN echo \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/nginx-dev/debian-9/Dockerfile.jinja2 b/docker/nginx-dev/debian-9/Dockerfile.jinja2 new file mode 100644 index 000000000..144cd8143 --- /dev/null +++ b/docker/nginx-dev/debian-9/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("nginx", "debian-9") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ nginxdev.general() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh similarity index 100% rename from docker/php-apache-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh rename to docker/nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh diff --git a/docker/php-apache-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf rename to docker/nginx-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/php-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/php-apache-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile b/docker/nginx-dev/ubuntu-12.04/Dockerfile new file mode 100644 index 000000000..ba5c9ee12 --- /dev/null +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/nginx-dev:ubuntu-12.04 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/nginx:ubuntu-12.04 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.53.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN echo \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 new file mode 100644 index 000000000..33f2d2bb2 --- /dev/null +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("nginx", "ubuntu-12.04") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ nginxdev.general() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh similarity index 100% rename from docker/php-apache-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh rename to docker/nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh diff --git a/docker/php-apache-dev/debian-8-php7/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/debian-8-php7/conf/etc/nginx/conf.d/02-dev.conf rename to docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/php-dev/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-dev/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/php-apache-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile b/docker/nginx-dev/ubuntu-14.04/Dockerfile new file mode 100644 index 000000000..d9511ad31 --- /dev/null +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/nginx-dev:ubuntu-14.04 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/nginx:ubuntu-14.04 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.53.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN echo \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 new file mode 100644 index 000000000..fa47fee73 --- /dev/null +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("nginx", "ubuntu-14.04") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ nginxdev.general() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh similarity index 100% rename from docker/php-apache-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh rename to docker/nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh diff --git a/docker/php-apache-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf rename to docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/php-dev/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-dev/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/php-apache-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile b/docker/nginx-dev/ubuntu-15.04/Dockerfile new file mode 100644 index 000000000..5af8c5d13 --- /dev/null +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/nginx-dev:ubuntu-15.04 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/nginx:ubuntu-15.04 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.53.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN echo \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 new file mode 100644 index 000000000..a787e39b1 --- /dev/null +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("nginx", "ubuntu-15.04") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ nginxdev.general() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh similarity index 100% rename from docker/php-apache-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh rename to docker/nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh diff --git a/docker/php-apache-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf rename to docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/php-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/php-apache-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile b/docker/nginx-dev/ubuntu-15.10/Dockerfile new file mode 100644 index 000000000..1eadb84d2 --- /dev/null +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/nginx-dev:ubuntu-15.10 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/nginx:ubuntu-15.10 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.53.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN echo \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 new file mode 100644 index 000000000..8a1395919 --- /dev/null +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("nginx", "ubuntu-15.10") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ nginxdev.general() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh similarity index 100% rename from docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh rename to docker/nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf rename to docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile b/docker/nginx-dev/ubuntu-16.04/Dockerfile new file mode 100644 index 000000000..dd007ce52 --- /dev/null +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/nginx-dev:ubuntu-16.04 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/nginx:ubuntu-16.04 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.53.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN echo \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 new file mode 100644 index 000000000..e667c951d --- /dev/null +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("nginx", "ubuntu-16.04") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ nginxdev.general() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh similarity index 100% rename from docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh rename to docker/nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf rename to docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/php-dev/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-dev/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml diff --git a/docker/nginx/alpine-3/Dockerfile b/docker/nginx/alpine-3/Dockerfile index de84b57a5..8fada7311 100644 --- a/docker/nginx/alpine-3/Dockerfile +++ b/docker/nginx/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index 925a82013..b0473fd19 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index cf3fdbcfc..5f06dae44 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index ab010eab0..ca48146d3 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index 92db33b58..1b05692bc 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index 3ae43469b..dac849bed 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index 186d1d83f..cd5e78091 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index 76cda0c78..3f11a092e 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index 480d106eb..75aa03b48 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index 0831bb9c4..0e9617efb 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/alpine-3-php7/Dockerfile b/docker/php-apache-dev/alpine-3-php7/Dockerfile index c73af9478..4fc17efb1 100644 --- a/docker/php-apache-dev/alpine-3-php7/Dockerfile +++ b/docker/php-apache-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -28,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 --role webdevops-php-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-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 bd51f1683..15cae3af1 100644 --- a/docker/php-apache-dev/alpine-3-php7/Dockerfile.jinja2 +++ b/docker/php-apache-dev/alpine-3-php7/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.alpine('php-apache php-apache-dev') }} +{{ apache.alpine('php-apache apache-dev') }} {{ docker.expose('80 443') }} 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/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + 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/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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/php-fpm.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 e059ad224..5f7c6e364 100644 --- a/docker/php-apache-dev/alpine-3/Dockerfile +++ b/docker/php-apache-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -28,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 --role webdevops-php-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-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 f9ed8c68c..ad3887881 100644 --- a/docker/php-apache-dev/alpine-3/Dockerfile.jinja2 +++ b/docker/php-apache-dev/alpine-3/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.alpine('php-apache php-apache-dev') }} +{{ apache.alpine('php-apache apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/main.yml 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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/php-fpm.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile index b2695ed82..9ffa53568 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -26,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 --role webdevops-php-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 index 151a772da..af1a8b55f 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.centos('php-apache php-apache-dev') }} +{{ apache.centos('php-apache apache-dev') }} {{ docker.expose('80 443') }} 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/centos-7-php56/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + 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/centos-7-php56/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache-dev/tasks/main.yml diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 66a6ec2ba..61a3c3846 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -26,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 --role webdevops-php-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-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 a2353ffca..2664b8a7f 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile.jinja2 +++ b/docker/php-apache-dev/centos-7/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.centos('php-apache php-apache-dev') }} +{{ apache.centos('php-apache apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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/php-fpm.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 9b94a5aea..0cd77055c 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -29,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 --role webdevops-php-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-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 1fedec9f2..0d1962b46 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile.jinja2 +++ b/docker/php-apache-dev/debian-7/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.debian8('php-apache php-apache-dev') }} +{{ apache.debian8('php-apache apache-dev') }} {{ docker.expose('80 443') }} 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/debian-7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + 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/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 eadb943cb..d4b931f64 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -29,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 --role webdevops-php-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-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 dc9a56563..7a5665dfe 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.debian8('php-apache php-apache-dev') }} +{{ apache.debian8('php-apache apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 cfec5af47..3a8fd9f4f 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -29,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 --role webdevops-php-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-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 00d798e30..a10176230 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile.jinja2 +++ b/docker/php-apache-dev/debian-8/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.debian8('php-apache php-apache-dev') }} +{{ apache.debian8('php-apache apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/main.yml 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 5cdd4c515..f7fb5c277 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -28,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 --role webdevops-php-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-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 d9612680c..8022b5217 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile.jinja2 +++ b/docker/php-apache-dev/debian-9/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.debian9('php-apache php-apache-dev') }} +{{ apache.debian9('php-apache apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/main.yml 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 61c095087..dc8e41e61 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -30,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 --role webdevops-php-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-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 a116dbe32..eba51bb0d 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.ubuntu12('php-apache php-apache-dev') }} +{{ apache.ubuntu12('php-apache apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 7c391536c..eb45877ee 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -30,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 --role webdevops-php-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-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 c00ac58d4..380fe27fd 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.ubuntu14('php-apache php-apache-dev') }} +{{ apache.ubuntu14('php-apache apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 156540630..1e588a0bd 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -29,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 --role webdevops-php-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-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 3fba515c0..13ad3a716 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.ubuntu15('php-apache php-apache-dev') }} +{{ apache.ubuntu15('php-apache apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 ad169a3c2..5d4f8c39d 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -29,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 --role webdevops-php-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-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 eb20bbf9c..9e87a8712 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.ubuntu16('php-apache php-apache-dev') }} +{{ apache.ubuntu16('php-apache apache-dev') }} {{ docker.expose('80 443') }} 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 deleted file mode 100644 index f1523ee02..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/nginx/conf.d/02-dev.conf b/docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder 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 deleted file mode 100644 index a2b27dece..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,4 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; -} diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/main.yml 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 eb299d16e..755dee89c 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -29,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 --role webdevops-php-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-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 d39068333..80d1e45f2 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.ubuntu16('php-apache php-apache-dev') }} +{{ apache.ubuntu16('php-apache apache-dev') }} {{ docker.expose('80 443') }} 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 deleted file mode 100644 index f1523ee02..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/nginx/conf.d/02-dev.conf b/docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder 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 deleted file mode 100644 index a2b27dece..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,4 +0,0 @@ -location ~* { - expires off; - 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-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 953eea2af..837d12766 100644 --- a/docker/php-apache/alpine-3-php7/Dockerfile +++ b/docker/php-apache/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/alpine-3/Dockerfile b/docker/php-apache/alpine-3/Dockerfile index ac6ee1b60..07226ae38 100644 --- a/docker/php-apache/alpine-3/Dockerfile +++ b/docker/php-apache/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile index 086a5ac4f..99f2a8898 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index 5c8a60ec7..3a5e341be 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index 29325af7c..dc31ed7df 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index 194bae0c0..8fad28f2e 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index 77ae8c9da..fa8e693c4 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index 42b2ad5d3..cc860da76 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index b9833546c..134b4cc9a 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index 31f9aaf90..ec68346d1 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index 8fc8d3199..177484ddd 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index 648e613ee..79332da7e 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index 4d096af9e..4ca4bb494 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-dev/alpine-3-php7/Dockerfile b/docker/php-dev/alpine-3-php7/Dockerfile index 3dc3e2ab9..c8aac2b7f 100644 --- a/docker/php-dev/alpine-3-php7/Dockerfile +++ b/docker/php-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 COPY conf/ /opt/docker/ 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 deleted file mode 100644 index f1523ee02..000000000 --- a/docker/php-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/nginx/conf.d/02-dev.conf b/docker/php-dev/alpine-3-php7/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/alpine-3-php7/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder 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 deleted file mode 100644 index a2b27dece..000000000 --- a/docker/php-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,4 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; -} 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 8d34c5176..d6bdc859e 100644 --- a/docker/php-dev/alpine-3/Dockerfile +++ b/docker/php-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 COPY conf/ /opt/docker/ 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 deleted file mode 100644 index f1523ee02..000000000 --- a/docker/php-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/nginx/conf.d/02-dev.conf b/docker/php-dev/alpine-3/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/alpine-3/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder 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 deleted file mode 100644 index a2b27dece..000000000 --- a/docker/php-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,4 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; -} 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index e4977a6f3..bce27f112 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh deleted file mode 100644 index f1523ee02..000000000 --- a/docker/php-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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-php56/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index a2b27dece..000000000 --- a/docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,4 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; -} diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- include: bootstrap/nginx.yml -- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 5d0f403be..8dace42e0 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 COPY conf/ /opt/docker/ 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 deleted file mode 100644 index f1523ee02..000000000 --- a/docker/php-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/nginx/conf.d/02-dev.conf b/docker/php-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder 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 deleted file mode 100644 index a2b27dece..000000000 --- a/docker/php-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,4 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; -} 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 c7a4371e2..72489ebaa 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 COPY conf/ /opt/docker/ 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 deleted file mode 100644 index f1523ee02..000000000 --- a/docker/php-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/nginx/conf.d/02-dev.conf b/docker/php-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-dev/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index a2b27dece..000000000 --- a/docker/php-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,4 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; -} 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 511f42614..76861c037 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 COPY conf/ /opt/docker/ 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 deleted file mode 100644 index f1523ee02..000000000 --- a/docker/php-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/.gitkeep b/docker/php-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-dev/debian-8-php7/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/debian-8-php7/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/debian-8-php7/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index a2b27dece..000000000 --- a/docker/php-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,4 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; -} 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 b0b015e39..2b7c24232 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 COPY conf/ /opt/docker/ 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 deleted file mode 100644 index f1523ee02..000000000 --- a/docker/php-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/.gitkeep b/docker/php-dev/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-dev/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index a2b27dece..000000000 --- a/docker/php-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,4 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; -} 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 3c46b281a..83e3e0daf 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 COPY conf/ /opt/docker/ 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 deleted file mode 100644 index f1523ee02..000000000 --- a/docker/php-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/.gitkeep b/docker/php-dev/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-dev/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index a2b27dece..000000000 --- a/docker/php-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,4 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; -} 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 175d81126..5633b733c 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 COPY conf/ /opt/docker/ 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 deleted file mode 100644 index f1523ee02..000000000 --- a/docker/php-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/.gitkeep b/docker/php-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index a2b27dece..000000000 --- a/docker/php-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,4 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; -} 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 6f9a14d68..b62f28c9f 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 COPY conf/ /opt/docker/ 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 deleted file mode 100644 index f1523ee02..000000000 --- a/docker/php-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/.gitkeep b/docker/php-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index a2b27dece..000000000 --- a/docker/php-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,4 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; -} 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 5bfa6831f..ecef17ef1 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 COPY conf/ /opt/docker/ 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 deleted file mode 100644 index f1523ee02..000000000 --- a/docker/php-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/.gitkeep b/docker/php-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index a2b27dece..000000000 --- a/docker/php-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,4 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; -} 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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 2d8c78f7e..d1e80c2ff 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 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 deleted file mode 100644 index a3d69cb39..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index f1523ee02..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/conf.d/02-dev.conf b/docker/php-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 98ffb37d4..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off diff --git a/docker/php-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - 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/conf.d/02-dev.conf b/docker/php-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index a2b27dece..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,4 +0,0 @@ -location ~* { - expires off; - 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 deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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/nginx.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml deleted file mode 100644 index 8075b2d9d..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Disable sendfile for nginx - lineinfile: - dest: /etc/nginx/nginx.conf - regexp: '[\s;]*{{ item.key }}[\s]*' - line: '{{ item.key }} {{ item.value }};' - with_items: - - { key: 'sendfile', value: "off" } 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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/main.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 27cb39726..69b102342 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 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 deleted file mode 100644 index a3d69cb39..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index f1523ee02..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/conf.d/02-dev.conf b/docker/php-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 98ffb37d4..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off diff --git a/docker/php-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - 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/conf.d/02-dev.conf b/docker/php-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index a2b27dece..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,4 +0,0 @@ -location ~* { - expires off; - 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 deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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/nginx.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml deleted file mode 100644 index 8075b2d9d..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Disable sendfile for nginx - lineinfile: - dest: /etc/nginx/nginx.conf - regexp: '[\s;]*{{ item.key }}[\s]*' - line: '{{ item.key }} {{ item.value }};' - with_items: - - { key: 'sendfile', value: "off" } 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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/main.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/alpine-3-php7/Dockerfile b/docker/php-nginx-dev/alpine-3-php7/Dockerfile index 606f5a78f..7db5e205d 100644 --- a/docker/php-nginx-dev/alpine-3-php7/Dockerfile +++ b/docker/php-nginx-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apk-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2 b/docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2 index e062086a1..27cd51b68 100644 --- a/docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ nginx.alpine('php-nginx php-nginx-dev') }} +{{ nginx.alpine('php-nginx nginx-dev') }} {{ docker.expose('80 443') }} 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 deleted file mode 100644 index a3d69cb39..000000000 --- a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/alpine-3-php7/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 98ffb37d4..000000000 --- a/docker/php-nginx-dev/alpine-3-php7/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-nginx-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - 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/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml 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 deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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/nginx.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml deleted file mode 100644 index 8075b2d9d..000000000 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Disable sendfile for nginx - lineinfile: - dest: /etc/nginx/nginx.conf - regexp: '[\s;]*{{ item.key }}[\s]*' - line: '{{ item.key }} {{ item.value }};' - with_items: - - { key: 'sendfile', value: "off" } 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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/main.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile b/docker/php-nginx-dev/alpine-3/Dockerfile index 8605ac465..497ca6bd1 100644 --- a/docker/php-nginx-dev/alpine-3/Dockerfile +++ b/docker/php-nginx-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apk-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile.jinja2 b/docker/php-nginx-dev/alpine-3/Dockerfile.jinja2 index 5fb85a652..2df7f1460 100644 --- a/docker/php-nginx-dev/alpine-3/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/alpine-3/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ nginx.alpine('php-nginx php-nginx-dev') }} +{{ nginx.alpine('php-nginx nginx-dev') }} {{ docker.expose('80 443') }} 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 deleted file mode 100644 index a3d69cb39..000000000 --- a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/alpine-3/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 98ffb37d4..000000000 --- a/docker/php-nginx-dev/alpine-3/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-nginx-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - 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/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml 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 deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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/nginx.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml deleted file mode 100644 index 8075b2d9d..000000000 --- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Disable sendfile for nginx - lineinfile: - dest: /etc/nginx/nginx.conf - regexp: '[\s;]*{{ item.key }}[\s]*' - line: '{{ item.key }} {{ item.value }};' - with_items: - - { key: 'sendfile', value: "off" } 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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/main.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile index ffecae252..895148816 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install tools RUN /usr/local/bin/yum-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 index d144187cc..9d535c69f 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ nginx.centos('php-nginx php-nginx-dev') }} +{{ nginx.centos('php-nginx nginx-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh deleted file mode 100644 index a3d69cb39..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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-php56/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 98ffb37d4..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - 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/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- include: bootstrap/nginx.yml -- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml deleted file mode 100644 index 8075b2d9d..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Disable sendfile for nginx - lineinfile: - dest: /etc/nginx/nginx.conf - regexp: '[\s;]*{{ item.key }}[\s]*' - line: '{{ item.key }} {{ item.value }};' - with_items: - - { key: 'sendfile', value: "off" } diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index e570d3f29..49701f02c 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install tools RUN /usr/local/bin/yum-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 b/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 index 8a07aa3fa..3a9fa481e 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ nginx.centos('php-nginx php-nginx-dev') }} +{{ nginx.centos('php-nginx nginx-dev') }} {{ docker.expose('80 443') }} 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 deleted file mode 100644 index a3d69cb39..000000000 --- a/docker/php-nginx-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 98ffb37d4..000000000 --- a/docker/php-nginx-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off diff --git a/docker/php-nginx-dev/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-nginx-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - 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/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml 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 deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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/nginx.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml deleted file mode 100644 index 8075b2d9d..000000000 --- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Disable sendfile for nginx - lineinfile: - dest: /etc/nginx/nginx.conf - regexp: '[\s;]*{{ item.key }}[\s]*' - line: '{{ item.key }} {{ item.value }};' - with_items: - - { key: 'sendfile', value: "off" } 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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/main.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index 24c4b9a0f..d63386756 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 index e5e71298c..7d0cd668a 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ nginx.debian('php-nginx php-nginx-dev') }} +{{ nginx.debian('php-nginx nginx-dev') }} {{ docker.expose('80 443') }} 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 deleted file mode 100644 index a3d69cb39..000000000 --- a/docker/php-nginx-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 98ffb37d4..000000000 --- a/docker/php-nginx-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off diff --git a/docker/php-nginx-dev/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-nginx-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - 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/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml 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 deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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/nginx.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml deleted file mode 100644 index 8075b2d9d..000000000 --- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Disable sendfile for nginx - lineinfile: - dest: /etc/nginx/nginx.conf - regexp: '[\s;]*{{ item.key }}[\s]*' - line: '{{ item.key }} {{ item.value }};' - with_items: - - { key: 'sendfile', value: "off" } 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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/main.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index d0ff3efbf..0a9a1566e 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 index 0bf81dfb7..1bf5b7799 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ nginx.debian('php-nginx php-nginx-dev') }} +{{ nginx.debian('php-nginx nginx-dev') }} {{ docker.expose('80 443') }} 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 deleted file mode 100644 index a3d69cb39..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/debian-8-php7/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 98ffb37d4..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off diff --git a/docker/php-nginx-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - 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/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml 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 deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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/nginx.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml deleted file mode 100644 index 8075b2d9d..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Disable sendfile for nginx - lineinfile: - dest: /etc/nginx/nginx.conf - regexp: '[\s;]*{{ item.key }}[\s]*' - line: '{{ item.key }} {{ item.value }};' - with_items: - - { key: 'sendfile', value: "off" } 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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/main.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index 090902422..db01819b1 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 index ce643a693..edac4ecfb 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ nginx.debian('php-nginx php-nginx-dev') }} +{{ nginx.debian('php-nginx nginx-dev') }} {{ docker.expose('80 443') }} 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 deleted file mode 100644 index a3d69cb39..000000000 --- a/docker/php-nginx-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 98ffb37d4..000000000 --- a/docker/php-nginx-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off diff --git a/docker/php-nginx-dev/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-nginx-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - 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/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml 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 deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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/nginx.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml deleted file mode 100644 index 8075b2d9d..000000000 --- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Disable sendfile for nginx - lineinfile: - dest: /etc/nginx/nginx.conf - regexp: '[\s;]*{{ item.key }}[\s]*' - line: '{{ item.key }} {{ item.value }};' - with_items: - - { key: 'sendfile', value: "off" } 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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/main.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index e24faf6b1..dae698513 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 index 6c09b612b..cc082226b 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ nginx.debian('php-nginx php-nginx-dev') }} +{{ nginx.debian('php-nginx nginx-dev') }} {{ docker.expose('80 443') }} 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 deleted file mode 100644 index a3d69cb39..000000000 --- a/docker/php-nginx-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 98ffb37d4..000000000 --- a/docker/php-nginx-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off diff --git a/docker/php-nginx-dev/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-nginx-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - 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/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml 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 deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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/nginx.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml deleted file mode 100644 index 8075b2d9d..000000000 --- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Disable sendfile for nginx - lineinfile: - dest: /etc/nginx/nginx.conf - regexp: '[\s;]*{{ item.key }}[\s]*' - line: '{{ item.key }} {{ item.value }};' - with_items: - - { key: 'sendfile', value: "off" } 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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/main.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index 57f80a42f..ea0192d0e 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 index 01d7cc434..db8fbf89d 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ nginx.ubuntu('php-nginx php-nginx-dev') }} +{{ nginx.ubuntu('php-nginx nginx-dev') }} {{ docker.expose('80 443') }} 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 deleted file mode 100644 index a3d69cb39..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 98ffb37d4..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - 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/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml 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 deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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/nginx.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml deleted file mode 100644 index 8075b2d9d..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Disable sendfile for nginx - lineinfile: - dest: /etc/nginx/nginx.conf - regexp: '[\s;]*{{ item.key }}[\s]*' - line: '{{ item.key }} {{ item.value }};' - with_items: - - { key: 'sendfile', value: "off" } 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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/main.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index 7a92237d4..fa90df977 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 index 8ba962027..89a6f2df1 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ nginx.ubuntu('php-nginx php-nginx-dev') }} +{{ nginx.ubuntu('php-nginx nginx-dev') }} {{ docker.expose('80 443') }} 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 deleted file mode 100644 index a3d69cb39..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 98ffb37d4..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - 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/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml 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 deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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/nginx.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml deleted file mode 100644 index 8075b2d9d..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Disable sendfile for nginx - lineinfile: - dest: /etc/nginx/nginx.conf - regexp: '[\s;]*{{ item.key }}[\s]*' - line: '{{ item.key }} {{ item.value }};' - with_items: - - { key: 'sendfile', value: "off" } 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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/main.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index 77c1df42b..8e74bc3ae 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 index 5bb91375e..e031bcae2 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ nginx.ubuntu('php-nginx php-nginx-dev') }} +{{ nginx.ubuntu('php-nginx nginx-dev') }} {{ docker.expose('80 443') }} 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 deleted file mode 100644 index a3d69cb39..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 98ffb37d4..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - 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/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml 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 deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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/nginx.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml deleted file mode 100644 index 8075b2d9d..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Disable sendfile for nginx - lineinfile: - dest: /etc/nginx/nginx.conf - regexp: '[\s;]*{{ item.key }}[\s]*' - line: '{{ item.key }} {{ item.value }};' - with_items: - - { key: 'sendfile', value: "off" } 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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/main.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index ac2e1b0b3..f1c4e655f 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 index db007f921..9e2e811f8 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ nginx.ubuntu('php-nginx php-nginx-dev') }} +{{ nginx.ubuntu('php-nginx nginx-dev') }} {{ docker.expose('80 443') }} 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 deleted file mode 100644 index a3d69cb39..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 98ffb37d4..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - 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/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml 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 deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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/nginx.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml deleted file mode 100644 index 8075b2d9d..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Disable sendfile for nginx - lineinfile: - dest: /etc/nginx/nginx.conf - regexp: '[\s;]*{{ item.key }}[\s]*' - line: '{{ item.key }} {{ item.value }};' - with_items: - - { key: 'sendfile', value: "off" } 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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/main.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index 03a7ff370..568a7312c 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 index 50f8b08a7..db07f583a 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -8,6 +8,6 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ nginx.ubuntu('php-nginx php-nginx-dev') }} +{{ nginx.ubuntu('php-nginx nginx-dev') }} {{ docker.expose('80 443') }} 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 deleted file mode 100644 index a3d69cb39..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 98ffb37d4..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - 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/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml 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 deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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 deleted file mode 100644 index 580d28c3c..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml deleted file mode 100644 index 81f5b7efd..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml deleted file mode 100644 index de7e76c72..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- 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/nginx.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml deleted file mode 100644 index 8075b2d9d..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Disable sendfile for nginx - lineinfile: - dest: /etc/nginx/nginx.conf - regexp: '[\s;]*{{ item.key }}[\s]*' - line: '{{ item.key }} {{ item.value }};' - with_items: - - { key: 'sendfile', value: "off" } 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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/main.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx/alpine-3-php7/Dockerfile b/docker/php-nginx/alpine-3-php7/Dockerfile index bb5cc235a..4ba90e2ff 100644 --- a/docker/php-nginx/alpine-3-php7/Dockerfile +++ b/docker/php-nginx/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/alpine-3/Dockerfile b/docker/php-nginx/alpine-3/Dockerfile index 66ec37f71..884a084f1 100644 --- a/docker/php-nginx/alpine-3/Dockerfile +++ b/docker/php-nginx/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index c455f5ae1..7c3f73b98 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index 8f7ff5a7b..8596f014d 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index b61db5b39..6b475297d 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index 75be817a1..469073a38 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index 1fa80664e..af8a8018b 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index 4f98a2f77..8ae035179 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index 5b122179f..1f25f02c7 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index fba1250f3..c907b7e59 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index f203823c7..9c689bbc6 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index 1203e5a8b..088f86b51 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index 1ab1c1a2c..5ded5f6ae 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/alpine-3-php7/Dockerfile b/docker/php/alpine-3-php7/Dockerfile index cb2224dc7..2a00673a9 100644 --- a/docker/php/alpine-3-php7/Dockerfile +++ b/docker/php/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -76,6 +76,8 @@ RUN /usr/local/bin/apk-install \ && pear upgrade-all \ && pear config-set auto_discover 1 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + # PECL workaround, see webdevops/Dockerfile#78 + && sed -i "s/ -n / /" $(which pecl) \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php/alpine-3/Dockerfile b/docker/php/alpine-3/Dockerfile index 76a94f8c8..7d09fd17e 100644 --- a/docker/php/alpine-3/Dockerfile +++ b/docker/php/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -70,6 +70,8 @@ RUN /usr/local/bin/apk-install \ && pear upgrade-all \ && pear config-set auto_discover 1 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + # PECL workaround, see webdevops/Dockerfile#78 + && sed -i "s/ -n / /" $(which pecl) \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index d16d63cdb..0d01af29e 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index f83bb2633..91995c111 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index 23eb9cf4e..950e4df19 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index 4f7e54693..4f22b3daf 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index b929a0aa1..7903c93e9 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index 1282191f4..aa257fae1 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index cf90db949..8b3b59fd0 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index 94d80749d..6e0c3a230 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index 4d8ca9194..15d586c5c 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index 521831bab..2cf56cd68 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index f3b2f642c..9e898ca70 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/piwik/ubuntu-14.04/Dockerfile b/docker/piwik/ubuntu-14.04/Dockerfile index e70b38d1f..9a5de62c5 100644 --- a/docker/piwik/ubuntu-14.04/Dockerfile +++ b/docker/piwik/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-nginx:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app/piwik/ ENV PIWIK_URL http://example.com/ diff --git a/docker/postfix/latest/Dockerfile b/docker/postfix/latest/Dockerfile index 9a394cdab..bf6fd030c 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 COPY conf/ /opt/docker/ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index d49a4e352..0a9a1cc25 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -8,7 +8,7 @@ FROM zendesk/samson:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ############################################################################### diff --git a/docker/samson-deployment/latest/baselayout.tar b/docker/samson-deployment/latest/baselayout.tar index 42188128a..cd19b173e 100644 Binary files a/docker/samson-deployment/latest/baselayout.tar and b/docker/samson-deployment/latest/baselayout.tar differ diff --git a/docker/samson-deployment/latest/conf/bin/entrypoint.sh b/docker/samson-deployment/latest/conf/bin/entrypoint.sh index f489687f5..b8a179e38 100644 --- a/docker/samson-deployment/latest/conf/bin/entrypoint.sh +++ b/docker/samson-deployment/latest/conf/bin/entrypoint.sh @@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh -if [ "$(/usr/bin/whoami)" == "root" ]; then +if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index 6859f7344..a09d6690e 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 RUN /usr/local/bin/apk-install \ # General sphinx diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index 031601219..3f8e2232c 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 RUN /opt/docker/bin/control.sh service.enable ssh diff --git a/docker/storage/latest/Dockerfile b/docker/storage/latest/Dockerfile index 6affa3a95..f49ba5bb2 100644 --- a/docker/storage/latest/Dockerfile +++ b/docker/storage/latest/Dockerfile @@ -8,7 +8,7 @@ FROM busybox:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 RUN mkdir /storage/ \ && chmod 777 /storage/ diff --git a/docker/typo3/ubuntu-14.04/Dockerfile b/docker/typo3/ubuntu-14.04/Dockerfile index d80066324..9c3f58845 100644 --- a/docker/typo3/ubuntu-14.04/Dockerfile +++ b/docker/typo3/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-apache:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV WEB_DOCUMENT_ROOT /app/web/ diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index 9a34791c8..1df291520 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV VARNISH_PORT 80 diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index 0e57137e3..a9462a09c 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 ENV FTP_USER application ENV FTP_PASSWORD application diff --git a/documentation/docs/content/DockerImages/dockerfiles/ansible.rst b/documentation/docs/content/DockerImages/dockerfiles/ansible.rst index 9b068000b..d2eea89ab 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/ansible.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/ansible.rst @@ -3,3 +3,8 @@ webdevops/ansible ================= All ``webdevops/ansible`` images are based on ``webvdevops/bootstrap`` without any changes. + +Docker image tags +----------------- + +.. include:: include/image-tag-base.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/apache-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/apache-dev.rst new file mode 100644 index 000000000..a222fffc9 --- /dev/null +++ b/documentation/docs/content/DockerImages/dockerfiles/apache-dev.rst @@ -0,0 +1,25 @@ +==================== +webdevops/apache-dev +==================== + +These image extends ``webdevops/base`` with a apache daemon which is running on port 80 and 443 + +.. include:: include/info-web-development.rst + +Docker image tags +----------------- + +.. include:: include/image-tag-base.rst + + +Environment variables +--------------------- + +.. include:: include/environment-base-app.rst +.. include:: include/environment-web-dev.rst + + +Docker image layout +------------------- + +.. include:: include/layout-apache.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/apache.rst b/documentation/docs/content/DockerImages/dockerfiles/apache.rst index 02fefed4b..f7cd4fccc 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/apache.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/apache.rst @@ -4,11 +4,11 @@ webdevops/apache These image extends ``webdevops/base`` with a apache daemon which is running on port 80 and 443 + Docker image tags ----------------- - - +.. include:: include/image-tag-base.rst Environment variables diff --git a/documentation/docs/content/DockerImages/dockerfiles/base-app.rst b/documentation/docs/content/DockerImages/dockerfiles/base-app.rst index 595de21a5..eabb507b9 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/base-app.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/base-app.rst @@ -28,6 +28,12 @@ For an example docker service .. attention:: Alpine doesn't provide any locales so you have to find another method for using locales! +Docker image tags +----------------- + +.. include:: include/image-tag-base.rst + + Environment variables --------------------- diff --git a/documentation/docs/content/DockerImages/dockerfiles/base.rst b/documentation/docs/content/DockerImages/dockerfiles/base.rst index 12af94d57..98c6d3df0 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/base.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/base.rst @@ -5,6 +5,12 @@ webdevops/base Our application base container contains some general tools, the provisioning system (Ansible), a preconfgured modular ``supervisord`` and a modular `entrypoint` script. +Docker image tags +----------------- + +.. include:: include/image-tag-base.rst + + Entrypoint ---------- diff --git a/documentation/docs/content/DockerImages/dockerfiles/bootstrap.rst b/documentation/docs/content/DockerImages/dockerfiles/bootstrap.rst index 50dbaa94e..b9d5b5442 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/bootstrap.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/bootstrap.rst @@ -5,6 +5,11 @@ webdevops/bootstrap Bootstrap images contains our baselayout (some basic scripts for secure and small package installations and handling) and a basic toolset. It will also install Ansible into the container for future provisioning of the container. +Docker image tags +----------------- + +.. include:: include/image-tag-base.rst + Baselayout scripts ------------------ diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/environment-php-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/include/environment-php-dev.rst new file mode 100644 index 000000000..267ca9ffe --- /dev/null +++ b/documentation/docs/content/DockerImages/dockerfiles/include/environment-php-dev.rst @@ -0,0 +1,13 @@ +========================== ============================ ============================================== +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 +``PHP_DEBUGGER`` Specifies which php debugger *empty* (eg. ``xdebug``, ``blackfire`` or + should be active ``none``) +========================== ============================ ============================================== diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/environment-web-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/include/environment-web-dev.rst index 267ca9ffe..36773e2df 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/include/environment-web-dev.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/include/environment-web-dev.rst @@ -8,6 +8,4 @@ Environment variable Description Default ``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 -``PHP_DEBUGGER`` Specifies which php debugger *empty* (eg. ``xdebug``, ``blackfire`` or - should be active ``none``) ========================== ============================ ============================================== diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-base.rst b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-base.rst new file mode 100644 index 000000000..d79ec5c04 --- /dev/null +++ b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-base.rst @@ -0,0 +1,13 @@ +====================== ========================== +Tag Distribution name +====================== ========================== +``ubuntu-12.04`` precise +``ubuntu-14.04`` trusty (LTS) +``ubuntu-15.04`` vivid +``ubuntu-15.10`` wily +``ubuntu-16.04`` xenial (LTS) +``debian-7`` wheezy +``debian-8`` jessie +``debian-9`` stretch +``centos-7`` +====================== ========================== diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst index abbedcaee..b295a3401 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst @@ -11,4 +11,5 @@ Tag Distribution name PHP Version ``debian-8-php7`` jessie with dotdeb PHP 7.x (via sury) ``debian-9`` stretch PHP 7.0 ``centos-7`` PHP 5.4 +``centos-7-php56`` PHP 5.6 ====================== ========================== =============== diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/info-web-development.rst b/documentation/docs/content/DockerImages/dockerfiles/include/info-web-development.rst new file mode 100644 index 000000000..21eaa2a31 --- /dev/null +++ b/documentation/docs/content/DockerImages/dockerfiles/include/info-web-development.rst @@ -0,0 +1 @@ +.. attention:: Webserver is running development mode, assets and resource files will be send without caching to browser! diff --git a/documentation/docs/content/DockerImages/dockerfiles/mail-catcher.rst b/documentation/docs/content/DockerImages/dockerfiles/mail-sandbox.rst similarity index 65% rename from documentation/docs/content/DockerImages/dockerfiles/mail-catcher.rst rename to documentation/docs/content/DockerImages/dockerfiles/mail-sandbox.rst index b3113dc2d..f8f525776 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/mail-catcher.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/mail-sandbox.rst @@ -9,6 +9,11 @@ This images catches all emails sent to it and stores them locally. These mails a Docker image tags ----------------- +====================== ========================== +Tag Distribution name +====================== ========================== +``latest`` Ubuntu 16.04 xenial (LTS) +====================== ========================== Environment variables diff --git a/documentation/docs/content/DockerImages/dockerfiles/nginx-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/nginx-dev.rst new file mode 100644 index 000000000..397ea5e2d --- /dev/null +++ b/documentation/docs/content/DockerImages/dockerfiles/nginx-dev.rst @@ -0,0 +1,26 @@ +=================== +webdevops/nginx-dev +=================== + +These image extends ``webdevops/base`` with a nginx daemon which is running on port 80 and 443 + +.. include:: include/info-web-development.rst + +Docker image tags +----------------- + +.. include:: include/image-tag-base.rst + + +Environment variables +--------------------- + +.. include:: include/environment-base-app.rst +.. include:: include/environment-web-dev.rst + + +Docker image layout +------------------- + +.. include:: include/layout-nginx.rst +.. include:: include/layout-php.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/nginx.rst b/documentation/docs/content/DockerImages/dockerfiles/nginx.rst index c35950262..c93f6a4d3 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/nginx.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/nginx.rst @@ -7,8 +7,7 @@ These image extends ``webdevops/base`` with a nginx daemon which is running on p Docker image tags ----------------- - - +.. include:: include/image-tag-base.rst Environment variables diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst index b1a9e5edf..6b955904d 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst @@ -9,7 +9,6 @@ These image extends ``webdevops/php-dev`` with a apache daemon which is running Docker image tags ----------------- - .. include:: include/image-tag-php.rst @@ -17,7 +16,7 @@ Environment variables --------------------- .. include:: include/environment-base-app.rst -.. include:: include/environment-web-dev.rst +.. include:: include/environment-php-dev.rst Docker image layout diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst b/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst index daaa3da01..1dd0a7c3d 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst @@ -7,7 +7,6 @@ These image extends ``webdevops/php`` with a apache daemon which is running on p Docker image tags ----------------- - .. include:: include/image-tag-php.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst index e02b2cb5e..fd7482075 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst @@ -9,14 +9,14 @@ These image extends ``webdevops/php`` with xdebug and development tools Docker image tags ----------------- - .. include:: include/image-tag-php.rst + Environment variables --------------------- .. include:: include/environment-base-app.rst -.. include:: include/environment-web-dev.rst +.. include:: include/environment-php-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 d1b9a17da..2884b2135 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst @@ -9,7 +9,6 @@ These image extends ``webdevops/php-dev`` with a nginx daemon which is running o Docker image tags ----------------- - .. include:: include/image-tag-php.rst @@ -17,7 +16,7 @@ Environment variables --------------------- .. include:: include/environment-base-app.rst -.. include:: include/environment-web-dev.rst +.. include:: include/environment-php-dev.rst Docker image layout diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst b/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst index ec55f98b0..3b1e74c5c 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst @@ -7,7 +7,6 @@ These image extends ``webdevops/php`` with a nginx daemon which is running on po Docker image tags ----------------- - .. include:: include/image-tag-php.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/php.rst b/documentation/docs/content/DockerImages/dockerfiles/php.rst index 709f253d6..0b0c4f449 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php.rst @@ -7,7 +7,6 @@ The php images are based on ``webdevops/base-app`` with PHP cli and PHP-FPM. PHP Docker image tags ----------------- - .. include:: include/image-tag-php.rst Environment variables diff --git a/documentation/docs/content/DockerImages/dockerfiles/postfix.rst b/documentation/docs/content/DockerImages/dockerfiles/postfix.rst index 5dff6e327..918890ec3 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/postfix.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/postfix.rst @@ -4,6 +4,12 @@ webdevops/postfix These image extends ``webdevops/base`` with a postfix daemon which is running on port 25 +Docker image tags +----------------- + +.. include:: include/image-tag-base.rst + + Environment variables --------------------- diff --git a/documentation/docs/content/DockerImages/dockerfiles/sphinx.rst b/documentation/docs/content/DockerImages/dockerfiles/sphinx.rst index 0160428a6..473a8f3fe 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/sphinx.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/sphinx.rst @@ -4,6 +4,15 @@ webdevops/sphinx These image extends ``webdevops/bootstrap`` and provides a sphinx build system. +Docker image tags +----------------- + +====================== ========================== +Tag Distribution name +====================== ========================== +``latest`` Alpine 3 +====================== ========================== + Usage ----- diff --git a/documentation/docs/content/DockerImages/dockerfiles/ssh.rst b/documentation/docs/content/DockerImages/dockerfiles/ssh.rst index 1761b8b70..952d28c3a 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/ssh.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/ssh.rst @@ -3,3 +3,12 @@ webdevops/ssh ============= These image extends ``webdevops/bootstrap`` and provides a standalone ssh server running on port 22. + +Docker image tags +----------------- + +====================== ========================== +Tag Distribution name +====================== ========================== +``latest`` Ubuntu 16.04 xenial (LTS) +====================== ========================== diff --git a/documentation/docs/content/DockerImages/dockerfiles/storage.rst b/documentation/docs/content/DockerImages/dockerfiles/storage.rst index f66bd0f55..e5b291e97 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/storage.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/storage.rst @@ -3,3 +3,12 @@ webdevops/storage ================= These image extends ``busybox`` and provides ``/storage`` as volume to other containers. + +Docker image tags +----------------- + +====================== ========================== +Tag Distribution name +====================== ========================== +``latest`` Busybox +====================== ========================== diff --git a/documentation/docs/content/DockerImages/dockerfiles/varnish.rst b/documentation/docs/content/DockerImages/dockerfiles/varnish.rst index 698eccd64..f76ce3028 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/varnish.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/varnish.rst @@ -5,6 +5,16 @@ webdevops/varnish These image extends ``webdevops/base`` and provides a standalone varnish server running on port 80. +Docker image tags +----------------- + +====================== ========================== +Tag Distribution name +====================== ========================== +``latest`` Alpine 3 +====================== ========================== + + Environment variables --------------------- diff --git a/documentation/docs/content/DockerImages/dockerfiles/vsftp.rst b/documentation/docs/content/DockerImages/dockerfiles/vsftp.rst index 2542cbe04..976d38d6f 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/vsftp.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/vsftp.rst @@ -4,6 +4,16 @@ webdevops/vsftp These image extends ``webdevops/base`` and provides a standalone vsftp server running on port 20 and 21. +Docker image tags +----------------- + +====================== ========================== +Tag Distribution name +====================== ========================== +``latest`` Ubuntu 16.04 xenial (LTS) +====================== ========================== + + Environment variables --------------------- diff --git a/documentation/docs/content/DockerImages/index.rst b/documentation/docs/content/DockerImages/index.rst index 924ce9311..fb926709c 100644 --- a/documentation/docs/content/DockerImages/index.rst +++ b/documentation/docs/content/DockerImages/index.rst @@ -14,14 +14,16 @@ Docker images dockerfiles/ansible dockerfiles/apache + dockerfiles/apache-dev dockerfiles/base dockerfiles/base-app dockerfiles/bootstrap dockerfiles/hhvm dockerfiles/hhvm-apache dockerfiles/hhvm-nginx - dockerfiles/mail-catcher + dockerfiles/mail-sandbox dockerfiles/nginx + dockerfiles/nginx-dev dockerfiles/php dockerfiles/php-apache dockerfiles/php-apache-dev diff --git a/documentation/docs/content/FAQ/index.rst b/documentation/docs/content/FAQ/index.rst new file mode 100644 index 000000000..0a84c5931 --- /dev/null +++ b/documentation/docs/content/FAQ/index.rst @@ -0,0 +1,6 @@ +=== +FAQ +=== + + +Placeholder diff --git a/documentation/docs/content/KnownIssues/index.rst b/documentation/docs/content/KnownIssues/index.rst index febe81a76..042203f69 100644 --- a/documentation/docs/content/KnownIssues/index.rst +++ b/documentation/docs/content/KnownIssues/index.rst @@ -2,6 +2,14 @@ Known issues ============ +General images +-------------- + +webdevops/...:alpine-3 +^^^^^^^^^^^^^^^^^^^^^^ + +- doesn't support ``locales`` (upstream issue) + PHP images ---------- @@ -22,7 +30,12 @@ webdevops/php...:alpine-3 - missing mhash +webdevops/php...-dev:alpine-3 +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +- missing blackfire (not supported) + webdevops/php...-dev:debian-8-php7 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - missing xdebug diff --git a/documentation/docs/index.rst b/documentation/docs/index.rst index b6291cca4..f406685f4 100644 --- a/documentation/docs/index.rst +++ b/documentation/docs/index.rst @@ -29,3 +29,4 @@ Overview content/Customization/index content/BuildingProcess/index content/KnownIssues/index + content/FAQ/index diff --git a/docker/php-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh b/provisioning/apache-dev/general/bin/service.d/httpd.d/12-development.sh similarity index 100% rename from docker/php-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh rename to provisioning/apache-dev/general/bin/service.d/httpd.d/12-development.sh diff --git a/docker/php-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf b/provisioning/apache-dev/general/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/php-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf rename to provisioning/apache-dev/general/etc/httpd/conf.d/02-dev.conf diff --git a/docker/php-dev/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep b/provisioning/apache-dev/general/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-dev/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep rename to provisioning/apache-dev/general/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/php-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/provisioning/apache-dev/general/etc/httpd/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf rename to provisioning/apache-dev/general/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/provisioning/apache-dev/general/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml rename to provisioning/apache-dev/general/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/provisioning/apache-dev/general/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/provisioning/apache-dev/general/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/provisioning/apache-dev/general/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/provisioning/apache-dev/general/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml rename to provisioning/apache-dev/general/provision/roles/webdevops-apache-dev/tasks/main.yml diff --git a/provisioning/base/general/bin/entrypoint.sh b/provisioning/base/general/bin/entrypoint.sh index f489687f5..b8a179e38 100644 --- a/provisioning/base/general/bin/entrypoint.sh +++ b/provisioning/base/general/bin/entrypoint.sh @@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh -if [ "$(/usr/bin/whoami)" == "root" ]; then +if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh b/provisioning/nginx-dev/general/bin/service.d/nginx.d/12-development.sh similarity index 100% rename from docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh rename to provisioning/nginx-dev/general/bin/service.d/nginx.d/12-development.sh diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf b/provisioning/nginx-dev/general/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf rename to provisioning/nginx-dev/general/etc/nginx/conf.d/02-dev.conf diff --git a/docker/php-dev/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep b/provisioning/nginx-dev/general/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-dev/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep rename to provisioning/nginx-dev/general/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/provisioning/nginx-dev/general/etc/nginx/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf rename to provisioning/nginx-dev/general/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml rename to provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml rename to provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml rename to provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev/tasks/main.yml 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 deleted file mode 100644 index a3d69cb39..000000000 --- a/provisioning/php-dev/general/bin/service.d/httpd.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index f1523ee02..000000000 --- a/provisioning/php-dev/general/bin/service.d/nginx.d/12-development.sh +++ /dev/null @@ -1 +0,0 @@ -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/conf.d/02-dev.conf b/provisioning/php-dev/general/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 98ffb37d4..000000000 --- a/provisioning/php-dev/general/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off diff --git a/provisioning/php-dev/general/etc/httpd/vhost.common.d/.gitkeep b/provisioning/php-dev/general/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index 54918ec2b..000000000 --- a/provisioning/php-dev/general/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - 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/conf.d/02-dev.conf b/provisioning/php-dev/general/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/provisioning/php-dev/general/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/provisioning/php-dev/general/etc/nginx/vhost.common.d/.gitkeep b/provisioning/php-dev/general/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 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 deleted file mode 100644 index a2b27dece..000000000 --- a/provisioning/php-dev/general/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,4 +0,0 @@ -location ~* { - expires off; - 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 deleted file mode 100644 index 81f5b7efd..000000000 --- a/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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 deleted file mode 100644 index 580d28c3c..000000000 --- a/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 1806c1a8c..000000000 --- a/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/defaults/main.yml deleted file mode 100644 index 81f5b7efd..000000000 --- a/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -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-nginx-dev/tasks/bootstrap.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml deleted file mode 100644 index de7e76c72..000000000 --- a/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- include: bootstrap/nginx.yml -- include: bootstrap/php-fpm.yml diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml deleted file mode 100644 index 8075b2d9d..000000000 --- a/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Disable sendfile for nginx - lineinfile: - dest: /etc/nginx/nginx.conf - regexp: '[\s;]*{{ item.key }}[\s]*' - line: '{{ item.key }} {{ item.value }};' - with_items: - - { key: 'sendfile', value: "off" } 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 deleted file mode 100644 index 947bfcfbb..000000000 --- a/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- 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/main.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/main.yml deleted file mode 100644 index 1806c1a8c..000000000 --- a/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index db2c0b7c7..c34c818e1 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -10,7 +10,7 @@ FROM {{ image }}:{{ tag }} MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.52.0 +LABEL io.webdevops.version=0.53.0 {%- endmacro %} {%- macro add(source, target) -%} diff --git a/template/Dockerfile/images/apache-dev.jinja2 b/template/Dockerfile/images/apache-dev.jinja2 new file mode 100644 index 000000000..31c788030 --- /dev/null +++ b/template/Dockerfile/images/apache-dev.jinja2 @@ -0,0 +1,7 @@ +{% import 'Dockerfile/provision.jinja2' as provision %} + +{% macro general(role='') -%} +# Install apache +RUN echo \ + {{ provision.runRoleInline('apache-dev', role) }} +{%- endmacro %} diff --git a/template/Dockerfile/images/nginx-dev.jinja2 b/template/Dockerfile/images/nginx-dev.jinja2 new file mode 100644 index 000000000..4c92aa67e --- /dev/null +++ b/template/Dockerfile/images/nginx-dev.jinja2 @@ -0,0 +1,7 @@ +{% import 'Dockerfile/provision.jinja2' as provision %} + +{% macro general(role='') -%} +# Install apache +RUN echo \ + {{ provision.runRoleInline('nginx-dev', role) }} +{%- endmacro %} diff --git a/template/Dockerfile/images/php5.jinja2 b/template/Dockerfile/images/php5.jinja2 index 53f80d26c..4f2461b96 100644 --- a/template/Dockerfile/images/php5.jinja2 +++ b/template/Dockerfile/images/php5.jinja2 @@ -55,6 +55,8 @@ RUN /usr/local/bin/apk-install \ && pear upgrade-all \ && pear config-set auto_discover 1 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + # PECL workaround, see webdevops/Dockerfile#78 + && sed -i "s/ -n / /" $(which pecl) \ {{ provision.runRoleInline('php', role) }} {%- endmacro %} diff --git a/template/Dockerfile/images/php7.jinja2 b/template/Dockerfile/images/php7.jinja2 index 8fb21b869..11cd31dce 100644 --- a/template/Dockerfile/images/php7.jinja2 +++ b/template/Dockerfile/images/php7.jinja2 @@ -61,6 +61,8 @@ RUN /usr/local/bin/apk-install \ && pear upgrade-all \ && pear config-set auto_discover 1 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + # PECL workaround, see webdevops/Dockerfile#78 + && sed -i "s/ -n / /" $(which pecl) \ {{ provision.runRoleInline('php', role) }} {%- endmacro %} diff --git a/template/Dockerfile/layout.jinja2 b/template/Dockerfile/layout.jinja2 index 0c3023b67..f6527e1bf 100644 --- a/template/Dockerfile/layout.jinja2 +++ b/template/Dockerfile/layout.jinja2 @@ -6,7 +6,9 @@ {% import 'Dockerfile/images/base.jinja2' as base %} {% import 'Dockerfile/images/baseapp.jinja2' as baseapp %} {% import 'Dockerfile/images/apache.jinja2' as apache %} +{% import 'Dockerfile/images/apache-dev.jinja2' as apachedev %} {% import 'Dockerfile/images/nginx.jinja2' as nginx %} +{% import 'Dockerfile/images/nginx-dev.jinja2' as nginxdev %} {% import 'Dockerfile/images/hhvm.jinja2' as hhvm %} {% import 'Dockerfile/images/postfix.jinja2' as postfix %} {% import 'Dockerfile/images/mail-sandbox.jinja2' as mailsandbox %} diff --git a/test/run.sh b/test/run.sh index 9fa1547be..ad8bf7e43 100755 --- a/test/run.sh +++ b/test/run.sh @@ -373,7 +373,7 @@ initEnvironment setEnvironmentOsFamily "alpine" OS_VERSION="3" runTestForTag "alpine-3" - waitForTestRun + #waitForTestRun ########## # PHP 7 @@ -424,7 +424,7 @@ initEnvironment setEnvironmentOsFamily "alpine" OS_VERSION="3" runTestForTag "alpine-3" - waitForTestRun + #waitForTestRun ########## # PHP 7 @@ -475,6 +475,34 @@ initEnvironment waitForTestRun } +####################################### +# webdevops/apache-dev +####################################### + +[[ $(checkTestTarget apache-dev) ]] && { + setupTestEnvironment "apache-dev" + + OS_VERSION="12.04" runTestForTag "ubuntu-12.04" + OS_VERSION="14.04" runTestForTag "ubuntu-14.04" + OS_VERSION="15.04" runTestForTag "ubuntu-15.04" + OS_VERSION="15.10" runTestForTag "ubuntu-15.10" + OS_VERSION="16.04" runTestForTag "ubuntu-16.04" + OS_VERSION="$DOCKER_TAG_LATEST" runTestForTag "latest" + + setEnvironmentOsFamily "redhat" + OS_VERSION="7" runTestForTag "centos-7" + + setEnvironmentOsFamily "debian" + OS_VERSION="7" runTestForTag "debian-7" + OS_VERSION="8" runTestForTag "debian-8" + OS_VERSION="testing" runTestForTag "debian-9" + + setEnvironmentOsFamily "alpine" + OS_VERSION="3" runTestForTag "alpine-3" + + waitForTestRun +} + ####################################### # webdevops/nginx ####################################### @@ -503,6 +531,35 @@ initEnvironment waitForTestRun } +####################################### +# webdevops/nginx-dev +####################################### + +[[ $(checkTestTarget nginx-dev) ]] && { + setupTestEnvironment "nginx-dev" + + OS_VERSION="12.04" runTestForTag "ubuntu-12.04" + OS_VERSION="14.04" runTestForTag "ubuntu-14.04" + OS_VERSION="15.04" runTestForTag "ubuntu-15.04" + OS_VERSION="15.10" runTestForTag "ubuntu-15.10" + OS_VERSION="16.04" runTestForTag "ubuntu-16.04" + OS_VERSION="$DOCKER_TAG_LATEST" runTestForTag "latest" + + setEnvironmentOsFamily "redhat" + OS_VERSION="7" runTestForTag "centos-7" + + setEnvironmentOsFamily "debian" + OS_VERSION="7" runTestForTag "debian-7" + OS_VERSION="8" runTestForTag "debian-8" + OS_VERSION="testing" runTestForTag "debian-9" + + setEnvironmentOsFamily "alpine" + OS_VERSION="3" runTestForTag "alpine-3" + + waitForTestRun +} + + ####################################### # webdevops/php-apache ####################################### @@ -532,7 +589,7 @@ initEnvironment setEnvironmentOsFamily "alpine" OS_VERSION="3" runTestForTag "alpine-3" - waitForTestRun + #waitForTestRun ########## # PHP 7 @@ -583,7 +640,7 @@ initEnvironment setEnvironmentOsFamily "alpine" OS_VERSION="3" runTestForTag "alpine-3" - waitForTestRun + #waitForTestRun ########## # PHP 7 @@ -633,7 +690,7 @@ initEnvironment setEnvironmentOsFamily "alpine" OS_VERSION="3" runTestForTag "alpine-3" - waitForTestRun + #waitForTestRun ########## # PHP 7 @@ -685,7 +742,7 @@ initEnvironment setEnvironmentOsFamily "alpine" OS_VERSION="3" runTestForTag "alpine-3" - waitForTestRun + #waitForTestRun ########## # PHP 7