diff --git a/CHANGELOG.md b/CHANGELOG.md index cab86312c..db24b9cf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ All notable changes to this project will be documented in this file. This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/Dockerfile). +## [1.2.3] - 2017-01-10 +- Removed default nginx vhost configuration (configuration collision) for alpine + ## [1.2.2] - 2017-01-09 - Removed deprecated SSLCompression option in Apache configuration (was disabled anyway) diff --git a/docker/ansible/alpine-3/Dockerfile b/docker/ansible/alpine-3/Dockerfile index 71108d1b1..ecc3a23c2 100644 --- a/docker/ansible/alpine-3/Dockerfile +++ b/docker/ansible/alpine-3/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index f93a83207..cceb8d1b8 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index 92c8dc93f..58a4f39c1 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index 11e336aab..8d1128c8c 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index 190edf089..fde5c14ef 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index 3269060d2..d60dab9a0 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index 4847ec2e0..05d8d8a16 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index a18aeb5c3..5c5ec85d4 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index e9480361f..1047826c3 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index 21f0c7a6a..bc1439d0f 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 diff --git a/docker/apache-dev/alpine-3/Dockerfile b/docker/apache-dev/alpine-3/Dockerfile index f25354584..a63ebd840 100644 --- a/docker/apache-dev/alpine-3/Dockerfile +++ b/docker/apache-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile index 2a85db6b0..0281a1566 100644 --- a/docker/apache-dev/centos-7/Dockerfile +++ b/docker/apache-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile index 1f6cf3e26..aa410fb99 100644 --- a/docker/apache-dev/debian-7/Dockerfile +++ b/docker/apache-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile index 6dc59f018..b730a1515 100644 --- a/docker/apache-dev/debian-8/Dockerfile +++ b/docker/apache-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile index bb21e325f..5a76875e1 100644 --- a/docker/apache-dev/debian-9/Dockerfile +++ b/docker/apache-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile index b936050c7..117015c11 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile index f38c34bf1..510ce743f 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile index f1e03da71..7481fc68c 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile index 9610fe422..c37653435 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile index b1ed2e78d..63740940f 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/alpine-3/Dockerfile b/docker/apache/alpine-3/Dockerfile index 850536c99..13cccffdd 100644 --- a/docker/apache/alpine-3/Dockerfile +++ b/docker/apache/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 9b21245d8..d5cdc4d38 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 d63cfc306..e4b8ec105 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 ea0229fe2..60d5177a8 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 cc8b1fef1..7749dad39 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 5a4be1f23..cca64d2dc 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 c3cc3ae51..2d01d1541 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 dacf8d45b..fb97fc847 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 248aac10c..215dd2c3f 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 a6efcf0d1..477e96e45 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 b75e09890..4f4f5c80c 100644 --- a/docker/base-app/alpine-3/Dockerfile +++ b/docker/base-app/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 3526f77ea..a6445e758 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 3f6105b70..70629d658 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 2b6f1edc6..1d40df5f8 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 e787d003f..0da75f55d 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 e435a5cb8..d2999d0e1 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 fb4774e0d..6ed6e610d 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 5a0ffa16d..6ed7d1ff8 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 7284a778d..fd1e5b290 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 136b7a1f5..9d570d35c 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile index 575a64770..a3ba86008 100644 --- a/docker/base/alpine-3/Dockerfile +++ b/docker/base/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 22be9f0c5..33177dbb2 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index c3c9ffa42..859ef25c0 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 66d4d560c..e45f27013 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 1b638ba00..697787209 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 21a996b66..e6aa0fae7 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index d2731776a..0f220afa0 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 4d94fb00f..fb6a39ccb 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index aca0e9fa6..182214dbb 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index efac80332..899e065a3 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index 11ee444d7..0c4df9930 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM alpine:3.5 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 00dee15ac..7231295c6 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM centos:7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index 3660a344b..821b3d8b1 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM debian:7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index b18bacdcb..6e39e929d 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM debian:8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index f259328f1..655cb6592 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM debian:stretch MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 45fae3182..b655ee24d 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index ab0f8facd..14eceb75f 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index f9a30ecaa..28ada459d 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index bd506b08f..c6ad9b2a0 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index caa9c06dc..5de5d979e 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile index 4eb85dad8..f3b5a0eeb 100644 --- a/docker/certbot/latest/Dockerfile +++ b/docker/certbot/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 VOLUME /etc/letsencrypt VOLUME /var/www diff --git a/docker/hhvm-apache/ubuntu-14.04/Dockerfile b/docker/hhvm-apache/ubuntu-14.04/Dockerfile index 5556c3d7a..7472bd085 100644 --- a/docker/hhvm-apache/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 4df453c97..da711a75c 100644 --- a/docker/hhvm-apache/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 919af94cd..e860dd67a 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm-nginx/ubuntu-14.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/hhvm-nginx/ubuntu-14.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/hhvm-nginx/ubuntu-14.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile index e55766cfa..b6d6d32a4 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm-nginx/ubuntu-16.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/hhvm-nginx/ubuntu-16.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/hhvm-nginx/ubuntu-16.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/hhvm/ubuntu-14.04/Dockerfile b/docker/hhvm/ubuntu-14.04/Dockerfile index 9882056f6..75c313ce0 100644 --- a/docker/hhvm/ubuntu-14.04/Dockerfile +++ b/docker/hhvm/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 5af8b2342..423924d1d 100644 --- a/docker/hhvm/ubuntu-16.04/Dockerfile +++ b/docker/hhvm/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/liquibase/latest/Dockerfile b/docker/liquibase/latest/Dockerfile index 0d98a57bf..db22e3dd0 100644 --- a/docker/liquibase/latest/Dockerfile +++ b/docker/liquibase/latest/Dockerfile @@ -8,7 +8,7 @@ FROM java:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV LIQUIBASE_VERSION "3.5.3" ENV LIQUIBASE_DRIVER "com.mysql.jdbc.Driver" diff --git a/docker/liquibase/mysql/Dockerfile b/docker/liquibase/mysql/Dockerfile index add6cfe70..7cf4a6f98 100644 --- a/docker/liquibase/mysql/Dockerfile +++ b/docker/liquibase/mysql/Dockerfile @@ -8,7 +8,7 @@ FROM java:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV LIQUIBASE_VERSION "3.5.3" ENV LIQUIBASE_DRIVER "com.mysql.jdbc.Driver" diff --git a/docker/liquibase/postgres/Dockerfile b/docker/liquibase/postgres/Dockerfile index 62fc61cae..16da7f54f 100644 --- a/docker/liquibase/postgres/Dockerfile +++ b/docker/liquibase/postgres/Dockerfile @@ -8,7 +8,7 @@ FROM java:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV LIQUIBASE_VERSION "3.5.3" ENV LIQUIBASE_DRIVER "org.postgresql.Driver" diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index f72975a31..0fb4dad6b 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-nginx:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV MAILBOX_USERNAME "dev" ENV MAILBOX_PASSWORD "dev" diff --git a/docker/nginx-dev/alpine-3/Dockerfile b/docker/nginx-dev/alpine-3/Dockerfile index 54fba8bb8..f532ed7f4 100644 --- a/docker/nginx-dev/alpine-3/Dockerfile +++ b/docker/nginx-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/centos-7/Dockerfile b/docker/nginx-dev/centos-7/Dockerfile index 333c8a1d9..ae69c95e2 100644 --- a/docker/nginx-dev/centos-7/Dockerfile +++ b/docker/nginx-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/debian-7/Dockerfile b/docker/nginx-dev/debian-7/Dockerfile index 45bdb2834..1f0a81946 100644 --- a/docker/nginx-dev/debian-7/Dockerfile +++ b/docker/nginx-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/debian-8/Dockerfile b/docker/nginx-dev/debian-8/Dockerfile index edbac8a12..80eac357f 100644 --- a/docker/nginx-dev/debian-8/Dockerfile +++ b/docker/nginx-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/debian-9/Dockerfile b/docker/nginx-dev/debian-9/Dockerfile index 0bc7b229b..fc4fb0e6a 100644 --- a/docker/nginx-dev/debian-9/Dockerfile +++ b/docker/nginx-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile b/docker/nginx-dev/ubuntu-12.04/Dockerfile index 311a78876..bd90a44a0 100644 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile b/docker/nginx-dev/ubuntu-14.04/Dockerfile index fcbe3e803..0f758583a 100644 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile b/docker/nginx-dev/ubuntu-15.04/Dockerfile index b36383e2c..0715bc7f1 100644 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile b/docker/nginx-dev/ubuntu-15.10/Dockerfile index 1bd0a51e4..cfe0d76c6 100644 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile b/docker/nginx-dev/ubuntu-16.04/Dockerfile index 780d82f34..94760e397 100644 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/alpine-3/Dockerfile b/docker/nginx/alpine-3/Dockerfile index c7cb2597b..6ec988cd0 100644 --- a/docker/nginx/alpine-3/Dockerfile +++ b/docker/nginx/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/alpine-3/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/nginx/alpine-3/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/nginx/alpine-3/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/nginx/alpine-3/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index f52671678..21d826db2 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/centos-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/nginx/centos-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/nginx/centos-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/nginx/centos-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index ee13681e4..82966c3ea 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/nginx/debian-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/nginx/debian-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/nginx/debian-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index 893755a80..7dd400e05 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-8/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/nginx/debian-8/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/nginx/debian-8/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/nginx/debian-8/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index b1413ab95..8c52f8394 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-9/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/nginx/debian-9/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/nginx/debian-9/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/nginx/debian-9/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index ac9eb1d22..c638e659b 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-12.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/nginx/ubuntu-12.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/nginx/ubuntu-12.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/nginx/ubuntu-12.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index 793b42df2..a63612d80 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-14.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/nginx/ubuntu-14.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/nginx/ubuntu-14.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/nginx/ubuntu-14.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index c592922fc..3ecbae97d 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-15.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/nginx/ubuntu-15.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/nginx/ubuntu-15.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/nginx/ubuntu-15.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index 0ba48f83a..9752b696e 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-15.10/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/nginx/ubuntu-15.10/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/nginx/ubuntu-15.10/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/nginx/ubuntu-15.10/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index fa753c255..7540ca9d8 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-16.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/nginx/ubuntu-16.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/nginx/ubuntu-16.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/nginx/ubuntu-16.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-apache-dev/alpine-3-php7/Dockerfile b/docker/php-apache-dev/alpine-3-php7/Dockerfile index 670390708..157085c51 100644 --- a/docker/php-apache-dev/alpine-3-php7/Dockerfile +++ b/docker/php-apache-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/alpine-3/Dockerfile b/docker/php-apache-dev/alpine-3/Dockerfile index 397295838..9c410a67a 100644 --- a/docker/php-apache-dev/alpine-3/Dockerfile +++ b/docker/php-apache-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile index abd36d0a6..2063ec290 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile index a1cadf79e..caf46a4cb 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile index 735a32907..9cc8bcd40 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile index 5fbb480e1..852decd46 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile index 83b930435..92d9adc12 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile index b978c1fe8..32651f634 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile index 0bb027936..b7f06e7aa 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile index 43c632786..54a7e1c0b 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile index fb00581fe..8fe02398d 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile index a8b826ae5..02e19f49f 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile index b71be4439..cb6c8e580 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/alpine-3-php7/Dockerfile b/docker/php-apache/alpine-3-php7/Dockerfile index 61294f66c..e2c61a0ca 100644 --- a/docker/php-apache/alpine-3-php7/Dockerfile +++ b/docker/php-apache/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 e41fc6531..9b3e780ba 100644 --- a/docker/php-apache/alpine-3/Dockerfile +++ b/docker/php-apache/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 e68e01730..1b3b83a4d 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 807f55608..fee02a078 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 232d69e99..27dd40daf 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 5f0a40174..4cf27d237 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 9d2b6530c..2159b21d4 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 e81939c03..87823b0b5 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 bf972f0b8..4b17c22bd 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 f3a61eae8..fbd25d237 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 f7e16d76f..56582ad2b 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 eed9b8044..31835f7e5 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 c05bcc9c0..db8c09c03 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 2be31f774..b5fc25d4f 100644 --- a/docker/php-dev/alpine-3-php7/Dockerfile +++ b/docker/php-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine-3/Dockerfile index 1114fe025..e55df0812 100644 --- a/docker/php-dev/alpine-3/Dockerfile +++ b/docker/php-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index e7a6b790c..829e02c60 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index f634023aa..1b111f3cd 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index 3c25ccdc3..c6cec6b8e 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index 726125a28..feafe158a 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index 7ffe7b7bb..9351cc17b 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 615e19e75..2e5048ad9 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index df44793d4..43e280918 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index 21a81c5c1..83bbac355 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index 79572665d..f3daa1ecc 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index 03dd78ea5..90b07b539 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 8b8b19caf..8418ca9e0 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx-dev/alpine-3-php7/Dockerfile b/docker/php-nginx-dev/alpine-3-php7/Dockerfile index 7ffad4f59..e03df506e 100644 --- a/docker/php-nginx-dev/alpine-3-php7/Dockerfile +++ b/docker/php-nginx-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile b/docker/php-nginx-dev/alpine-3/Dockerfile index 447d14986..e2231a230 100644 --- a/docker/php-nginx-dev/alpine-3/Dockerfile +++ b/docker/php-nginx-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile index e18943532..a47425e5b 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index 42eaae315..757ad30d6 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index 45c8f03af..d5e1455a1 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index 5d852b6ad..04b7ec0dd 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index 554f00b1f..f4708b1ce 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index e7719175b..94ff7fe95 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index f1621ea92..d8082ee84 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index f08c205fb..db5915271 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index a9196d6d5..ca3b6e316 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index e4f58ebe4..e1b3b2186 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index 3fb2e7223..fd5842f2f 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx/alpine-3-php7/Dockerfile b/docker/php-nginx/alpine-3-php7/Dockerfile index cfef7b995..bba66d459 100644 --- a/docker/php-nginx/alpine-3-php7/Dockerfile +++ b/docker/php-nginx/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/alpine-3-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/alpine-3-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx/alpine-3-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx/alpine-3-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx/alpine-3/Dockerfile b/docker/php-nginx/alpine-3/Dockerfile index 00cadabbb..08e66132f 100644 --- a/docker/php-nginx/alpine-3/Dockerfile +++ b/docker/php-nginx/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/alpine-3/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/alpine-3/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx/alpine-3/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx/alpine-3/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index e954fdbd7..1ae715f7e 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index 00a977291..4a5e58a8b 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/centos-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/centos-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx/centos-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx/centos-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index 2e9cf336f..60d8fc5d9 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/debian-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx/debian-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx/debian-7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index 1acc5f827..6cf3bcc8f 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-8-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/debian-8-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx/debian-8-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx/debian-8-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index 99ada220a..4d91acd9c 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-8/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/debian-8/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx/debian-8/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx/debian-8/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index 74dc165df..7a30f794b 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-9/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/debian-9/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx/debian-9/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx/debian-9/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index 6345e1363..9d6ef219c 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-12.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/ubuntu-12.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx/ubuntu-12.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx/ubuntu-12.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index ddc00f2f6..5166af31f 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-14.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/ubuntu-14.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx/ubuntu-14.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx/ubuntu-14.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index c6a072573..3ad4b77a3 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-15.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/ubuntu-15.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx/ubuntu-15.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx/ubuntu-15.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index 23ea39f50..30d408846 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-15.10/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/ubuntu-15.10/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx/ubuntu-15.10/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx/ubuntu-15.10/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index edef1c6fc..ce0eccb08 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-16.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/ubuntu-16.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/docker/php-nginx/ubuntu-16.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/docker/php-nginx/ubuntu-16.04/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/docker/php/alpine-3-php7/Dockerfile b/docker/php/alpine-3-php7/Dockerfile index 8638ab1f2..c709c8804 100644 --- a/docker/php/alpine-3-php7/Dockerfile +++ b/docker/php/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/alpine-3/Dockerfile b/docker/php/alpine-3/Dockerfile index 28ade2fbe..67a92d5a5 100644 --- a/docker/php/alpine-3/Dockerfile +++ b/docker/php/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index 8eb1fbf10..260418071 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 d27971ae4..7fcf1f449 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 e5cc0d939..32876eb86 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 1818fbb80..068a1d09e 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 2a3dd8417..59ad0dcf9 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 88432afe9..21c9e3354 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 0c293f7fa..ce4a6266d 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 d90a304b4..27d736543 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 c25f823ae..a9a7b9ac2 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 42ddf8ed8..d57793626 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 6317d79ef..326c6a6ef 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 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 ca4bdc614..dac4c4574 100644 --- a/docker/piwik/ubuntu-14.04/Dockerfile +++ b/docker/piwik/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-nginx:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app/piwik/ ENV PIWIK_URL http://example.com/ diff --git a/docker/postfix/latest/Dockerfile b/docker/postfix/latest/Dockerfile index 07b39363a..37e5250dc 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 COPY conf/ /opt/docker/ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 72b026f96..c02ed427b 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -8,7 +8,7 @@ FROM zendesk/samson:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ############################################################################### diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index 937cd4e36..3be2d093c 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 RUN /usr/local/bin/apk-install \ # General sphinx diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index a830090f4..9448b97e9 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 RUN /opt/docker/bin/control.sh service.enable ssh diff --git a/docker/storage/latest/Dockerfile b/docker/storage/latest/Dockerfile index da97adac8..f4ec9a460 100644 --- a/docker/storage/latest/Dockerfile +++ b/docker/storage/latest/Dockerfile @@ -8,7 +8,7 @@ FROM busybox:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 RUN mkdir /storage/ \ && chmod 777 /storage/ diff --git a/docker/typo3/ubuntu-14.04/Dockerfile b/docker/typo3/ubuntu-14.04/Dockerfile index c06b2421f..02d775df0 100644 --- a/docker/typo3/ubuntu-14.04/Dockerfile +++ b/docker/typo3/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-apache:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV WEB_DOCUMENT_ROOT /app/web/ diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index d96478a0e..cca7e1219 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV VARNISH_PORT 80 diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index 269d37c42..9c230cd30 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 ENV FTP_USER application ENV FTP_PASSWORD application diff --git a/provisioning/nginx/general/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/provisioning/nginx/general/provision/roles/webdevops-nginx/tasks/bootstrap.yml index d133e7c73..7edb04ee4 100644 --- a/provisioning/nginx/general/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ b/provisioning/nginx/general/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -29,8 +29,14 @@ - name: Remove default vhost file: - path: "/etc/nginx/sites-enabled/default" + path: "{{ item }}" state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + - name: Replace default nginx.conf [RedHat/Alpine family] file: diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index 2b3005ea6..68cb5449f 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -10,7 +10,7 @@ FROM {{ image }}:{{ tag }} MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.2 +LABEL io.webdevops.version=1.2.3 {%- endmacro %} {%- macro add(source, target) -%}