diff --git a/CHANGELOG.md b/CHANGELOG.md index 324414960..ebfa03edc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/Dockerfile). +## [1.3.1] - 2017-01-30 +- Introduce /entrypoint.d and /entrypoint.cmd +- Switch to endless tail in noop cmd (entrypoint cmd) +- Improve syslog (eg. configuration improvements; switch to file/pipe based if tty is available or not; fixes warning) +- Improved serverspec run (missing fsync after creation of Dockerfile) +- Remove Makefile target dist-upgrade (not needed anymore) +- Merge setup and requiements target +- Introduce RETRY env var, set default to 1 +- Smaller bugfixes + ## [1.3.0] - 2017-01-26 - Enabled `docker --user` support - Added `service check` for checking if a service is running diff --git a/Makefile b/Makefile index d71e79632..df22fda9a 100644 --- a/Makefile +++ b/Makefile @@ -29,8 +29,10 @@ applications: webdevops/typo3 webdevops/piwik misc: webdevops/mail-sandbox webdevops/sphinx webdevops/liquibase +setup: requirements + requirements: - pip install -r ./bin/requirements.txt + pip install --upgrade -I -r ./bin/requirements.txt cd tests/serverspec && bundle install --path=vendor test: @@ -45,24 +47,9 @@ provision: publish: dist-update rebuild test old-test push -dist-update: - docker pull centos:7 - docker pull ubuntu:12.04 - docker pull ubuntu:14.04 - docker pull ubuntu:15.04 - docker pull ubuntu:15.10 - docker pull ubuntu:16.04 - docker pull debian:7 - docker pull debian:8 - docker pull debian:stretch - docker pull alpine:3.4 - push: python ./bin/console docker:push --threads=auto -setup: - pip install --upgrade -I -r ./requirements.txt - graph: python ./bin/console generate:graph diff --git a/bin/requirements.txt b/bin/requirements.txt index 8d2f3adab..32c9462c7 100644 --- a/bin/requirements.txt +++ b/bin/requirements.txt @@ -3,7 +3,7 @@ graphviz>=0.4.10 cleo>=0.5.0 yamlordereddictloader>=0.1.0 testinfra>=1.4.2 -doit>=0.29.0 +doit==0.29.0 termcolor>=1.1.0 pytest-timeout>=1.0.0 pytest-rerunfailures>=1.0.0 diff --git a/bin/webdevops/Configuration.py b/bin/webdevops/Configuration.py index 7306727b4..3d6cfad25 100644 --- a/bin/webdevops/Configuration.py +++ b/bin/webdevops/Configuration.py @@ -73,7 +73,7 @@ 'verbosity': 0, 'threads': 1, - 'retry': 5, + 'retry': 1, 'dryRun': False, } diff --git a/bin/webdevops/command/BaseCommand.py b/bin/webdevops/command/BaseCommand.py index 01c0888d8..ba7bb0137 100644 --- a/bin/webdevops/command/BaseCommand.py +++ b/bin/webdevops/command/BaseCommand.py @@ -253,7 +253,8 @@ def get_retry(self): Get number of retries """ default = 1 - retry = max(0, int(self.option('retry'))) + retry = os.getenv('RETRY', self.option('retry')) + retry = max(0, int(retry)) if retry > 0: # user value diff --git a/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py b/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py index 0d362c6e1..928d776b9 100644 --- a/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py +++ b/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py @@ -127,6 +127,7 @@ def task_run(dockerfile, configuration, task): with open(test_dockerfile.name, mode='w', buffering=0) as f: f.write(dockerfile_content) f.flush() + os.fsync(f.fileno()) f.close() test_status = False diff --git a/docker/ansible/alpine-3/Dockerfile b/docker/ansible/alpine-3/Dockerfile index f5bf776ab..7d09338ea 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.3.0 +LABEL io.webdevops.version=1.3.1 diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index e3e27cd1c..10c1781bd 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.3.0 +LABEL io.webdevops.version=1.3.1 diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index b9ce49ba1..5be8f1a33 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.3.0 +LABEL io.webdevops.version=1.3.1 diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index 981b232f1..555ef85a4 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.3.0 +LABEL io.webdevops.version=1.3.1 diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index 2691cd24e..ced2519e0 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.3.0 +LABEL io.webdevops.version=1.3.1 diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index 2b4b405b8..54585bc8f 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.3.0 +LABEL io.webdevops.version=1.3.1 diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index 421e03edd..cf61b27a8 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.3.0 +LABEL io.webdevops.version=1.3.1 diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index 4598d2ae8..838232003 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.3.0 +LABEL io.webdevops.version=1.3.1 diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index 0da6add54..bfd039313 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.3.0 +LABEL io.webdevops.version=1.3.1 diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index d47150717..099791da5 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.3.0 +LABEL io.webdevops.version=1.3.1 diff --git a/docker/apache-dev/alpine-3/Dockerfile b/docker/apache-dev/alpine-3/Dockerfile index 44f49c053..485f811a5 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.3.0 +LABEL io.webdevops.version=1.3.1 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 4c3c1bf3f..024104c90 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.3.0 +LABEL io.webdevops.version=1.3.1 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 2f213f43e..084c54f08 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.3.0 +LABEL io.webdevops.version=1.3.1 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 50e2c1fe5..cbbec9bad 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.3.0 +LABEL io.webdevops.version=1.3.1 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 672946d15..b9d4fbe65 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.3.0 +LABEL io.webdevops.version=1.3.1 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 9a3854b9b..d9cb58d15 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.3.0 +LABEL io.webdevops.version=1.3.1 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 d572b7e53..be06e7e0d 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.3.0 +LABEL io.webdevops.version=1.3.1 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 859d49ea8..939f8d7bc 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.3.0 +LABEL io.webdevops.version=1.3.1 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 a98d91d93..0ac7097db 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.3.0 +LABEL io.webdevops.version=1.3.1 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 e0accdfe9..324c306a2 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.3.0 +LABEL io.webdevops.version=1.3.1 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 4a30701d2..5c7a06b01 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.3.0 +LABEL io.webdevops.version=1.3.1 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 8f6a33f1c..152b07256 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.3.0 +LABEL io.webdevops.version=1.3.1 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 eaf977b46..2ae331bcb 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.3.0 +LABEL io.webdevops.version=1.3.1 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 d98460fc5..501c14915 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.3.0 +LABEL io.webdevops.version=1.3.1 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 b684abae2..a1442f80b 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.3.0 +LABEL io.webdevops.version=1.3.1 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 bf7ce1100..75ac530ab 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.3.0 +LABEL io.webdevops.version=1.3.1 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 fd87479d0..0ed156b8c 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.3.0 +LABEL io.webdevops.version=1.3.1 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 769196545..a7da5849a 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.3.0 +LABEL io.webdevops.version=1.3.1 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 b3b7a2677..1256f1317 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.3.0 +LABEL io.webdevops.version=1.3.1 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 f2365f5c4..1d6411881 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.3.0 +LABEL io.webdevops.version=1.3.1 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 326242f0e..7d41d0fbb 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.3.0 +LABEL io.webdevops.version=1.3.1 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 4c9b1972e..725d7b749 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.3.0 +LABEL io.webdevops.version=1.3.1 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 35df3b117..36f38f1cc 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.3.0 +LABEL io.webdevops.version=1.3.1 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 866b94c76..e802439c0 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.3.0 +LABEL io.webdevops.version=1.3.1 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 117a26b07..5604a9af2 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.3.0 +LABEL io.webdevops.version=1.3.1 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 e4d8c1cea..fc1f5a9ef 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.3.0 +LABEL io.webdevops.version=1.3.1 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 9451ee409..b6ec9512f 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.3.0 +LABEL io.webdevops.version=1.3.1 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 a05a806ef..c327696fc 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.3.0 +LABEL io.webdevops.version=1.3.1 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 50d61ef66..3b3e1a5cd 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.3.0 +LABEL io.webdevops.version=1.3.1 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 850823164..91e349a84 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile index 7c9d436c8..b23de0cb0 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/alpine-3/conf/bin/config.sh b/docker/base/alpine-3/conf/bin/config.sh index 2ab34037d..3155728e8 100644 --- a/docker/base/alpine-3/conf/bin/config.sh +++ b/docker/base/alpine-3/conf/bin/config.sh @@ -60,10 +60,12 @@ function replaceTextInFile() { # ## function includeScriptDir() { - for FILE in "$1"/*.sh; do - # run custom scripts, only once - . "$FILE" - done + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + # run custom scripts, only once + . "$FILE" + done + fi } ### @@ -144,6 +146,7 @@ function runProvisionOnBuild() { ## function runProvisionEntrypoint() { includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" runDockerProvision entrypoint } diff --git a/docker/base/alpine-3/conf/bin/entrypoint.d/noop.sh b/docker/base/alpine-3/conf/bin/entrypoint.d/noop.sh index fac67d34b..967920837 100644 --- a/docker/base/alpine-3/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/alpine-3/conf/bin/entrypoint.d/noop.sh @@ -4,7 +4,5 @@ ## NOOP (no operation) ############################################# -while true; do - sleep 1 -done +tail -f /dev/null exit diff --git a/docker/base/alpine-3/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/alpine-3/conf/bin/service.d/syslog-ng.d/10-init.sh index ee2efa6e1..0cae9494b 100644 --- a/docker/base/alpine-3/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/alpine-3/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -3,3 +3,8 @@ # then we remove it. if [ ! -S /dev/log ]; then rm -f /dev/log; fi if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf &> /dev/null +fi diff --git a/docker/base/alpine-3/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/alpine-3/conf/etc/syslog-ng/syslog-ng.conf index 960677f9a..c69841581 100644 --- a/docker/base/alpine-3/conf/etc/syslog-ng/syslog-ng.conf +++ b/docker/base/alpine-3/conf/etc/syslog-ng/syslog-ng.conf @@ -1,18 +1,48 @@ @version: 3.5 -template t_isostamp { template("[SYSLOG] $MSGHDR$MSG\n"); }; - -options { file-template(t_isostamp); }; +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; -options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); - owner("root"); group("adm"); perm(0640); stats_freq(0); - bad_hostname("^gconfd$"); +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START }; source s_src { - unix-stream("/dev/log"); - internal(); + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END }; -destination d_all { pipe("/docker.stdout"); }; -log { source(s_src); destination(d_all); }; +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 0bcf102fe..8dfbf9665 100644 --- a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -1,8 +1,16 @@ --- -- name: Register logrotate configurations +- name: Create /entrypoint.d file: - src: '/opt/docker/provision/entrypoint.d' - dest: '/entrypoint.d' + path: "/entrypoint.d" + state: directory + owner: "root" + group: "root" + mode: 0700 + +- name: Create /entrypoint.cmd + file: + src: '/opt/docker/bin/entrypoint.d' + dest: '/entrypoint.cmd' state: link force: yes diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 7ee9e9018..99739eb3d 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/centos-7/conf/bin/config.sh b/docker/base/centos-7/conf/bin/config.sh index 2ab34037d..3155728e8 100644 --- a/docker/base/centos-7/conf/bin/config.sh +++ b/docker/base/centos-7/conf/bin/config.sh @@ -60,10 +60,12 @@ function replaceTextInFile() { # ## function includeScriptDir() { - for FILE in "$1"/*.sh; do - # run custom scripts, only once - . "$FILE" - done + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + # run custom scripts, only once + . "$FILE" + done + fi } ### @@ -144,6 +146,7 @@ function runProvisionOnBuild() { ## function runProvisionEntrypoint() { includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" runDockerProvision entrypoint } diff --git a/docker/base/centos-7/conf/bin/entrypoint.d/noop.sh b/docker/base/centos-7/conf/bin/entrypoint.d/noop.sh index fac67d34b..967920837 100644 --- a/docker/base/centos-7/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/centos-7/conf/bin/entrypoint.d/noop.sh @@ -4,7 +4,5 @@ ## NOOP (no operation) ############################################# -while true; do - sleep 1 -done +tail -f /dev/null exit diff --git a/docker/base/centos-7/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/centos-7/conf/bin/service.d/syslog-ng.d/10-init.sh index ee2efa6e1..0cae9494b 100644 --- a/docker/base/centos-7/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/centos-7/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -3,3 +3,8 @@ # then we remove it. if [ ! -S /dev/log ]; then rm -f /dev/log; fi if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf &> /dev/null +fi diff --git a/docker/base/centos-7/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/centos-7/conf/etc/syslog-ng/syslog-ng.conf index 960677f9a..c69841581 100644 --- a/docker/base/centos-7/conf/etc/syslog-ng/syslog-ng.conf +++ b/docker/base/centos-7/conf/etc/syslog-ng/syslog-ng.conf @@ -1,18 +1,48 @@ @version: 3.5 -template t_isostamp { template("[SYSLOG] $MSGHDR$MSG\n"); }; - -options { file-template(t_isostamp); }; +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; -options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); - owner("root"); group("adm"); perm(0640); stats_freq(0); - bad_hostname("^gconfd$"); +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START }; source s_src { - unix-stream("/dev/log"); - internal(); + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END }; -destination d_all { pipe("/docker.stdout"); }; -log { source(s_src); destination(d_all); }; +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 0bcf102fe..8dfbf9665 100644 --- a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -1,8 +1,16 @@ --- -- name: Register logrotate configurations +- name: Create /entrypoint.d file: - src: '/opt/docker/provision/entrypoint.d' - dest: '/entrypoint.d' + path: "/entrypoint.d" + state: directory + owner: "root" + group: "root" + mode: 0700 + +- name: Create /entrypoint.cmd + file: + src: '/opt/docker/bin/entrypoint.d' + dest: '/entrypoint.cmd' state: link force: yes diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index 0d4bc2a82..c060f2c17 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-7/conf/bin/config.sh b/docker/base/debian-7/conf/bin/config.sh index 2ab34037d..3155728e8 100644 --- a/docker/base/debian-7/conf/bin/config.sh +++ b/docker/base/debian-7/conf/bin/config.sh @@ -60,10 +60,12 @@ function replaceTextInFile() { # ## function includeScriptDir() { - for FILE in "$1"/*.sh; do - # run custom scripts, only once - . "$FILE" - done + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + # run custom scripts, only once + . "$FILE" + done + fi } ### @@ -144,6 +146,7 @@ function runProvisionOnBuild() { ## function runProvisionEntrypoint() { includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" runDockerProvision entrypoint } diff --git a/docker/base/debian-7/conf/bin/entrypoint.d/noop.sh b/docker/base/debian-7/conf/bin/entrypoint.d/noop.sh index fac67d34b..967920837 100644 --- a/docker/base/debian-7/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/debian-7/conf/bin/entrypoint.d/noop.sh @@ -4,7 +4,5 @@ ## NOOP (no operation) ############################################# -while true; do - sleep 1 -done +tail -f /dev/null exit diff --git a/docker/base/debian-7/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/debian-7/conf/bin/service.d/syslog-ng.d/10-init.sh index ee2efa6e1..0cae9494b 100644 --- a/docker/base/debian-7/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/debian-7/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -3,3 +3,8 @@ # then we remove it. if [ ! -S /dev/log ]; then rm -f /dev/log; fi if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf &> /dev/null +fi diff --git a/docker/base/debian-7/conf/etc/supervisor.conf b/docker/base/debian-7/conf/etc/supervisor.conf index 58094580d..7c109515a 100644 --- a/docker/base/debian-7/conf/etc/supervisor.conf +++ b/docker/base/debian-7/conf/etc/supervisor.conf @@ -3,6 +3,8 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock +# username = root +# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/base/debian-7/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/debian-7/conf/etc/syslog-ng/syslog-ng.conf index 960677f9a..c69841581 100644 --- a/docker/base/debian-7/conf/etc/syslog-ng/syslog-ng.conf +++ b/docker/base/debian-7/conf/etc/syslog-ng/syslog-ng.conf @@ -1,18 +1,48 @@ @version: 3.5 -template t_isostamp { template("[SYSLOG] $MSGHDR$MSG\n"); }; - -options { file-template(t_isostamp); }; +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; -options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); - owner("root"); group("adm"); perm(0640); stats_freq(0); - bad_hostname("^gconfd$"); +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START }; source s_src { - unix-stream("/dev/log"); - internal(); + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END }; -destination d_all { pipe("/docker.stdout"); }; -log { source(s_src); destination(d_all); }; +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 0bcf102fe..8dfbf9665 100644 --- a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -1,8 +1,16 @@ --- -- name: Register logrotate configurations +- name: Create /entrypoint.d file: - src: '/opt/docker/provision/entrypoint.d' - dest: '/entrypoint.d' + path: "/entrypoint.d" + state: directory + owner: "root" + group: "root" + mode: 0700 + +- name: Create /entrypoint.cmd + file: + src: '/opt/docker/bin/entrypoint.d' + dest: '/entrypoint.cmd' state: link force: yes diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 72ce23f95..aec63b5de 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-8/conf/bin/config.sh b/docker/base/debian-8/conf/bin/config.sh index 2ab34037d..3155728e8 100644 --- a/docker/base/debian-8/conf/bin/config.sh +++ b/docker/base/debian-8/conf/bin/config.sh @@ -60,10 +60,12 @@ function replaceTextInFile() { # ## function includeScriptDir() { - for FILE in "$1"/*.sh; do - # run custom scripts, only once - . "$FILE" - done + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + # run custom scripts, only once + . "$FILE" + done + fi } ### @@ -144,6 +146,7 @@ function runProvisionOnBuild() { ## function runProvisionEntrypoint() { includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" runDockerProvision entrypoint } diff --git a/docker/base/debian-8/conf/bin/entrypoint.d/noop.sh b/docker/base/debian-8/conf/bin/entrypoint.d/noop.sh index fac67d34b..967920837 100644 --- a/docker/base/debian-8/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/debian-8/conf/bin/entrypoint.d/noop.sh @@ -4,7 +4,5 @@ ## NOOP (no operation) ############################################# -while true; do - sleep 1 -done +tail -f /dev/null exit diff --git a/docker/base/debian-8/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/debian-8/conf/bin/service.d/syslog-ng.d/10-init.sh index ee2efa6e1..0cae9494b 100644 --- a/docker/base/debian-8/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/debian-8/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -3,3 +3,8 @@ # then we remove it. if [ ! -S /dev/log ]; then rm -f /dev/log; fi if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf &> /dev/null +fi diff --git a/docker/base/debian-8/conf/etc/supervisor.conf b/docker/base/debian-8/conf/etc/supervisor.conf index 58094580d..7c109515a 100644 --- a/docker/base/debian-8/conf/etc/supervisor.conf +++ b/docker/base/debian-8/conf/etc/supervisor.conf @@ -3,6 +3,8 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock +# username = root +# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/base/debian-8/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/debian-8/conf/etc/syslog-ng/syslog-ng.conf index 960677f9a..c69841581 100644 --- a/docker/base/debian-8/conf/etc/syslog-ng/syslog-ng.conf +++ b/docker/base/debian-8/conf/etc/syslog-ng/syslog-ng.conf @@ -1,18 +1,48 @@ @version: 3.5 -template t_isostamp { template("[SYSLOG] $MSGHDR$MSG\n"); }; - -options { file-template(t_isostamp); }; +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; -options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); - owner("root"); group("adm"); perm(0640); stats_freq(0); - bad_hostname("^gconfd$"); +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START }; source s_src { - unix-stream("/dev/log"); - internal(); + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END }; -destination d_all { pipe("/docker.stdout"); }; -log { source(s_src); destination(d_all); }; +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 0bcf102fe..8dfbf9665 100644 --- a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -1,8 +1,16 @@ --- -- name: Register logrotate configurations +- name: Create /entrypoint.d file: - src: '/opt/docker/provision/entrypoint.d' - dest: '/entrypoint.d' + path: "/entrypoint.d" + state: directory + owner: "root" + group: "root" + mode: 0700 + +- name: Create /entrypoint.cmd + file: + src: '/opt/docker/bin/entrypoint.d' + dest: '/entrypoint.cmd' state: link force: yes diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index deff64dea..503a811c2 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-9/conf/bin/config.sh b/docker/base/debian-9/conf/bin/config.sh index 2ab34037d..3155728e8 100644 --- a/docker/base/debian-9/conf/bin/config.sh +++ b/docker/base/debian-9/conf/bin/config.sh @@ -60,10 +60,12 @@ function replaceTextInFile() { # ## function includeScriptDir() { - for FILE in "$1"/*.sh; do - # run custom scripts, only once - . "$FILE" - done + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + # run custom scripts, only once + . "$FILE" + done + fi } ### @@ -144,6 +146,7 @@ function runProvisionOnBuild() { ## function runProvisionEntrypoint() { includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" runDockerProvision entrypoint } diff --git a/docker/base/debian-9/conf/bin/entrypoint.d/noop.sh b/docker/base/debian-9/conf/bin/entrypoint.d/noop.sh index fac67d34b..967920837 100644 --- a/docker/base/debian-9/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/debian-9/conf/bin/entrypoint.d/noop.sh @@ -4,7 +4,5 @@ ## NOOP (no operation) ############################################# -while true; do - sleep 1 -done +tail -f /dev/null exit diff --git a/docker/base/debian-9/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/debian-9/conf/bin/service.d/syslog-ng.d/10-init.sh index ee2efa6e1..0cae9494b 100644 --- a/docker/base/debian-9/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/debian-9/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -3,3 +3,8 @@ # then we remove it. if [ ! -S /dev/log ]; then rm -f /dev/log; fi if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf &> /dev/null +fi diff --git a/docker/base/debian-9/conf/etc/supervisor.conf b/docker/base/debian-9/conf/etc/supervisor.conf index 58094580d..7c109515a 100644 --- a/docker/base/debian-9/conf/etc/supervisor.conf +++ b/docker/base/debian-9/conf/etc/supervisor.conf @@ -3,6 +3,8 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock +# username = root +# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/base/debian-9/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/debian-9/conf/etc/syslog-ng/syslog-ng.conf index 960677f9a..c69841581 100644 --- a/docker/base/debian-9/conf/etc/syslog-ng/syslog-ng.conf +++ b/docker/base/debian-9/conf/etc/syslog-ng/syslog-ng.conf @@ -1,18 +1,48 @@ @version: 3.5 -template t_isostamp { template("[SYSLOG] $MSGHDR$MSG\n"); }; - -options { file-template(t_isostamp); }; +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; -options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); - owner("root"); group("adm"); perm(0640); stats_freq(0); - bad_hostname("^gconfd$"); +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START }; source s_src { - unix-stream("/dev/log"); - internal(); + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END }; -destination d_all { pipe("/docker.stdout"); }; -log { source(s_src); destination(d_all); }; +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 0bcf102fe..8dfbf9665 100644 --- a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -1,8 +1,16 @@ --- -- name: Register logrotate configurations +- name: Create /entrypoint.d file: - src: '/opt/docker/provision/entrypoint.d' - dest: '/entrypoint.d' + path: "/entrypoint.d" + state: directory + owner: "root" + group: "root" + mode: 0700 + +- name: Create /entrypoint.cmd + file: + src: '/opt/docker/bin/entrypoint.d' + dest: '/entrypoint.cmd' state: link force: yes diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 6261346f1..6f78a32ea 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-12.04/conf/bin/config.sh b/docker/base/ubuntu-12.04/conf/bin/config.sh index 2ab34037d..3155728e8 100644 --- a/docker/base/ubuntu-12.04/conf/bin/config.sh +++ b/docker/base/ubuntu-12.04/conf/bin/config.sh @@ -60,10 +60,12 @@ function replaceTextInFile() { # ## function includeScriptDir() { - for FILE in "$1"/*.sh; do - # run custom scripts, only once - . "$FILE" - done + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + # run custom scripts, only once + . "$FILE" + done + fi } ### @@ -144,6 +146,7 @@ function runProvisionOnBuild() { ## function runProvisionEntrypoint() { includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" runDockerProvision entrypoint } diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/noop.sh index fac67d34b..967920837 100644 --- a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/noop.sh @@ -4,7 +4,5 @@ ## NOOP (no operation) ############################################# -while true; do - sleep 1 -done +tail -f /dev/null exit diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/syslog-ng.d/10-init.sh index ee2efa6e1..0cae9494b 100644 --- a/docker/base/ubuntu-12.04/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/ubuntu-12.04/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -3,3 +3,8 @@ # then we remove it. if [ ! -S /dev/log ]; then rm -f /dev/log; fi if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf &> /dev/null +fi diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.conf b/docker/base/ubuntu-12.04/conf/etc/supervisor.conf index 58094580d..7c109515a 100644 --- a/docker/base/ubuntu-12.04/conf/etc/supervisor.conf +++ b/docker/base/ubuntu-12.04/conf/etc/supervisor.conf @@ -3,6 +3,8 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock +# username = root +# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/base/ubuntu-12.04/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/ubuntu-12.04/conf/etc/syslog-ng/syslog-ng.conf index 960677f9a..c69841581 100644 --- a/docker/base/ubuntu-12.04/conf/etc/syslog-ng/syslog-ng.conf +++ b/docker/base/ubuntu-12.04/conf/etc/syslog-ng/syslog-ng.conf @@ -1,18 +1,48 @@ @version: 3.5 -template t_isostamp { template("[SYSLOG] $MSGHDR$MSG\n"); }; - -options { file-template(t_isostamp); }; +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; -options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); - owner("root"); group("adm"); perm(0640); stats_freq(0); - bad_hostname("^gconfd$"); +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START }; source s_src { - unix-stream("/dev/log"); - internal(); + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END }; -destination d_all { pipe("/docker.stdout"); }; -log { source(s_src); destination(d_all); }; +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 0bcf102fe..8dfbf9665 100644 --- a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -1,8 +1,16 @@ --- -- name: Register logrotate configurations +- name: Create /entrypoint.d file: - src: '/opt/docker/provision/entrypoint.d' - dest: '/entrypoint.d' + path: "/entrypoint.d" + state: directory + owner: "root" + group: "root" + mode: 0700 + +- name: Create /entrypoint.cmd + file: + src: '/opt/docker/bin/entrypoint.d' + dest: '/entrypoint.cmd' state: link force: yes diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index f3508ed55..56dbc0893 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-14.04/conf/bin/config.sh b/docker/base/ubuntu-14.04/conf/bin/config.sh index 2ab34037d..3155728e8 100644 --- a/docker/base/ubuntu-14.04/conf/bin/config.sh +++ b/docker/base/ubuntu-14.04/conf/bin/config.sh @@ -60,10 +60,12 @@ function replaceTextInFile() { # ## function includeScriptDir() { - for FILE in "$1"/*.sh; do - # run custom scripts, only once - . "$FILE" - done + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + # run custom scripts, only once + . "$FILE" + done + fi } ### @@ -144,6 +146,7 @@ function runProvisionOnBuild() { ## function runProvisionEntrypoint() { includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" runDockerProvision entrypoint } diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/noop.sh index fac67d34b..967920837 100644 --- a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/noop.sh @@ -4,7 +4,5 @@ ## NOOP (no operation) ############################################# -while true; do - sleep 1 -done +tail -f /dev/null exit diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/syslog-ng.d/10-init.sh index ee2efa6e1..0cae9494b 100644 --- a/docker/base/ubuntu-14.04/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/ubuntu-14.04/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -3,3 +3,8 @@ # then we remove it. if [ ! -S /dev/log ]; then rm -f /dev/log; fi if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf &> /dev/null +fi diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.conf b/docker/base/ubuntu-14.04/conf/etc/supervisor.conf index 58094580d..7c109515a 100644 --- a/docker/base/ubuntu-14.04/conf/etc/supervisor.conf +++ b/docker/base/ubuntu-14.04/conf/etc/supervisor.conf @@ -3,6 +3,8 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock +# username = root +# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/base/ubuntu-14.04/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/ubuntu-14.04/conf/etc/syslog-ng/syslog-ng.conf index 960677f9a..c69841581 100644 --- a/docker/base/ubuntu-14.04/conf/etc/syslog-ng/syslog-ng.conf +++ b/docker/base/ubuntu-14.04/conf/etc/syslog-ng/syslog-ng.conf @@ -1,18 +1,48 @@ @version: 3.5 -template t_isostamp { template("[SYSLOG] $MSGHDR$MSG\n"); }; - -options { file-template(t_isostamp); }; +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; -options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); - owner("root"); group("adm"); perm(0640); stats_freq(0); - bad_hostname("^gconfd$"); +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START }; source s_src { - unix-stream("/dev/log"); - internal(); + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END }; -destination d_all { pipe("/docker.stdout"); }; -log { source(s_src); destination(d_all); }; +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 0bcf102fe..8dfbf9665 100644 --- a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -1,8 +1,16 @@ --- -- name: Register logrotate configurations +- name: Create /entrypoint.d file: - src: '/opt/docker/provision/entrypoint.d' - dest: '/entrypoint.d' + path: "/entrypoint.d" + state: directory + owner: "root" + group: "root" + mode: 0700 + +- name: Create /entrypoint.cmd + file: + src: '/opt/docker/bin/entrypoint.d' + dest: '/entrypoint.cmd' state: link force: yes diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 51914a974..a5e3acd2c 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-15.04/conf/bin/config.sh b/docker/base/ubuntu-15.04/conf/bin/config.sh index 2ab34037d..3155728e8 100644 --- a/docker/base/ubuntu-15.04/conf/bin/config.sh +++ b/docker/base/ubuntu-15.04/conf/bin/config.sh @@ -60,10 +60,12 @@ function replaceTextInFile() { # ## function includeScriptDir() { - for FILE in "$1"/*.sh; do - # run custom scripts, only once - . "$FILE" - done + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + # run custom scripts, only once + . "$FILE" + done + fi } ### @@ -144,6 +146,7 @@ function runProvisionOnBuild() { ## function runProvisionEntrypoint() { includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" runDockerProvision entrypoint } diff --git a/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/noop.sh index fac67d34b..967920837 100644 --- a/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/noop.sh @@ -4,7 +4,5 @@ ## NOOP (no operation) ############################################# -while true; do - sleep 1 -done +tail -f /dev/null exit diff --git a/docker/base/ubuntu-15.04/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/syslog-ng.d/10-init.sh index ee2efa6e1..0cae9494b 100644 --- a/docker/base/ubuntu-15.04/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/ubuntu-15.04/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -3,3 +3,8 @@ # then we remove it. if [ ! -S /dev/log ]; then rm -f /dev/log; fi if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf &> /dev/null +fi diff --git a/docker/base/ubuntu-15.04/conf/etc/supervisor.conf b/docker/base/ubuntu-15.04/conf/etc/supervisor.conf index 58094580d..7c109515a 100644 --- a/docker/base/ubuntu-15.04/conf/etc/supervisor.conf +++ b/docker/base/ubuntu-15.04/conf/etc/supervisor.conf @@ -3,6 +3,8 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock +# username = root +# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/base/ubuntu-15.04/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/ubuntu-15.04/conf/etc/syslog-ng/syslog-ng.conf index 960677f9a..c69841581 100644 --- a/docker/base/ubuntu-15.04/conf/etc/syslog-ng/syslog-ng.conf +++ b/docker/base/ubuntu-15.04/conf/etc/syslog-ng/syslog-ng.conf @@ -1,18 +1,48 @@ @version: 3.5 -template t_isostamp { template("[SYSLOG] $MSGHDR$MSG\n"); }; - -options { file-template(t_isostamp); }; +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; -options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); - owner("root"); group("adm"); perm(0640); stats_freq(0); - bad_hostname("^gconfd$"); +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START }; source s_src { - unix-stream("/dev/log"); - internal(); + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END }; -destination d_all { pipe("/docker.stdout"); }; -log { source(s_src); destination(d_all); }; +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 0bcf102fe..8dfbf9665 100644 --- a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -1,8 +1,16 @@ --- -- name: Register logrotate configurations +- name: Create /entrypoint.d file: - src: '/opt/docker/provision/entrypoint.d' - dest: '/entrypoint.d' + path: "/entrypoint.d" + state: directory + owner: "root" + group: "root" + mode: 0700 + +- name: Create /entrypoint.cmd + file: + src: '/opt/docker/bin/entrypoint.d' + dest: '/entrypoint.cmd' state: link force: yes diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index f0448f8b6..dda98ab69 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-15.10/conf/bin/config.sh b/docker/base/ubuntu-15.10/conf/bin/config.sh index 2ab34037d..3155728e8 100644 --- a/docker/base/ubuntu-15.10/conf/bin/config.sh +++ b/docker/base/ubuntu-15.10/conf/bin/config.sh @@ -60,10 +60,12 @@ function replaceTextInFile() { # ## function includeScriptDir() { - for FILE in "$1"/*.sh; do - # run custom scripts, only once - . "$FILE" - done + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + # run custom scripts, only once + . "$FILE" + done + fi } ### @@ -144,6 +146,7 @@ function runProvisionOnBuild() { ## function runProvisionEntrypoint() { includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" runDockerProvision entrypoint } diff --git a/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/noop.sh index fac67d34b..967920837 100644 --- a/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/noop.sh @@ -4,7 +4,5 @@ ## NOOP (no operation) ############################################# -while true; do - sleep 1 -done +tail -f /dev/null exit diff --git a/docker/base/ubuntu-15.10/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/syslog-ng.d/10-init.sh index ee2efa6e1..0cae9494b 100644 --- a/docker/base/ubuntu-15.10/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/ubuntu-15.10/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -3,3 +3,8 @@ # then we remove it. if [ ! -S /dev/log ]; then rm -f /dev/log; fi if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf &> /dev/null +fi diff --git a/docker/base/ubuntu-15.10/conf/etc/supervisor.conf b/docker/base/ubuntu-15.10/conf/etc/supervisor.conf index 58094580d..7c109515a 100644 --- a/docker/base/ubuntu-15.10/conf/etc/supervisor.conf +++ b/docker/base/ubuntu-15.10/conf/etc/supervisor.conf @@ -3,6 +3,8 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock +# username = root +# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/base/ubuntu-15.10/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/ubuntu-15.10/conf/etc/syslog-ng/syslog-ng.conf index 960677f9a..c69841581 100644 --- a/docker/base/ubuntu-15.10/conf/etc/syslog-ng/syslog-ng.conf +++ b/docker/base/ubuntu-15.10/conf/etc/syslog-ng/syslog-ng.conf @@ -1,18 +1,48 @@ @version: 3.5 -template t_isostamp { template("[SYSLOG] $MSGHDR$MSG\n"); }; - -options { file-template(t_isostamp); }; +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; -options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); - owner("root"); group("adm"); perm(0640); stats_freq(0); - bad_hostname("^gconfd$"); +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START }; source s_src { - unix-stream("/dev/log"); - internal(); + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END }; -destination d_all { pipe("/docker.stdout"); }; -log { source(s_src); destination(d_all); }; +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 0bcf102fe..8dfbf9665 100644 --- a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -1,8 +1,16 @@ --- -- name: Register logrotate configurations +- name: Create /entrypoint.d file: - src: '/opt/docker/provision/entrypoint.d' - dest: '/entrypoint.d' + path: "/entrypoint.d" + state: directory + owner: "root" + group: "root" + mode: 0700 + +- name: Create /entrypoint.cmd + file: + src: '/opt/docker/bin/entrypoint.d' + dest: '/entrypoint.cmd' state: link force: yes diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index 6113fe4e4..ac54c6185 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-16.04/conf/bin/config.sh b/docker/base/ubuntu-16.04/conf/bin/config.sh index 2ab34037d..3155728e8 100644 --- a/docker/base/ubuntu-16.04/conf/bin/config.sh +++ b/docker/base/ubuntu-16.04/conf/bin/config.sh @@ -60,10 +60,12 @@ function replaceTextInFile() { # ## function includeScriptDir() { - for FILE in "$1"/*.sh; do - # run custom scripts, only once - . "$FILE" - done + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + # run custom scripts, only once + . "$FILE" + done + fi } ### @@ -144,6 +146,7 @@ function runProvisionOnBuild() { ## function runProvisionEntrypoint() { includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" runDockerProvision entrypoint } diff --git a/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/noop.sh index fac67d34b..967920837 100644 --- a/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/noop.sh @@ -4,7 +4,5 @@ ## NOOP (no operation) ############################################# -while true; do - sleep 1 -done +tail -f /dev/null exit diff --git a/docker/base/ubuntu-16.04/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/syslog-ng.d/10-init.sh index ee2efa6e1..0cae9494b 100644 --- a/docker/base/ubuntu-16.04/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/ubuntu-16.04/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -3,3 +3,8 @@ # then we remove it. if [ ! -S /dev/log ]; then rm -f /dev/log; fi if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf &> /dev/null +fi diff --git a/docker/base/ubuntu-16.04/conf/etc/supervisor.conf b/docker/base/ubuntu-16.04/conf/etc/supervisor.conf index 58094580d..7c109515a 100644 --- a/docker/base/ubuntu-16.04/conf/etc/supervisor.conf +++ b/docker/base/ubuntu-16.04/conf/etc/supervisor.conf @@ -3,6 +3,8 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock +# username = root +# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/base/ubuntu-16.04/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/ubuntu-16.04/conf/etc/syslog-ng/syslog-ng.conf index 960677f9a..c69841581 100644 --- a/docker/base/ubuntu-16.04/conf/etc/syslog-ng/syslog-ng.conf +++ b/docker/base/ubuntu-16.04/conf/etc/syslog-ng/syslog-ng.conf @@ -1,18 +1,48 @@ @version: 3.5 -template t_isostamp { template("[SYSLOG] $MSGHDR$MSG\n"); }; - -options { file-template(t_isostamp); }; +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; -options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); - owner("root"); group("adm"); perm(0640); stats_freq(0); - bad_hostname("^gconfd$"); +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START }; source s_src { - unix-stream("/dev/log"); - internal(); + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END }; -destination d_all { pipe("/docker.stdout"); }; -log { source(s_src); destination(d_all); }; +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 0bcf102fe..8dfbf9665 100644 --- a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -1,8 +1,16 @@ --- -- name: Register logrotate configurations +- name: Create /entrypoint.d file: - src: '/opt/docker/provision/entrypoint.d' - dest: '/entrypoint.d' + path: "/entrypoint.d" + state: directory + owner: "root" + group: "root" + mode: 0700 + +- name: Create /entrypoint.cmd + file: + src: '/opt/docker/bin/entrypoint.d' + dest: '/entrypoint.cmd' state: link force: yes diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index bef9a5eea..322a1fff9 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.3.0 +LABEL io.webdevops.version=1.3.1 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 599b048af..1dfb99b22 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.3.0 +LABEL io.webdevops.version=1.3.1 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index b7edc9705..68522a23c 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.3.0 +LABEL io.webdevops.version=1.3.1 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index d1b66e3ac..ffb653db6 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.3.0 +LABEL io.webdevops.version=1.3.1 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index bcde42b1f..8088a2c26 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.3.0 +LABEL io.webdevops.version=1.3.1 # 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 5ec037f23..bd09f1787 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.3.0 +LABEL io.webdevops.version=1.3.1 # 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 d8c7de936..2b0a94831 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.3.0 +LABEL io.webdevops.version=1.3.1 # 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 ba7de3802..e41d17dae 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.3.0 +LABEL io.webdevops.version=1.3.1 # 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 a8e089b2c..62a348386 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.3.0 +LABEL io.webdevops.version=1.3.1 # 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 fe8587edf..9cbf8194e 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.3.0 +LABEL io.webdevops.version=1.3.1 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile index 7d4dbe01b..fa00b05e6 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.3.0 +LABEL io.webdevops.version=1.3.1 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 68bb44ac2..8e7e3d50b 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.3.0 +LABEL io.webdevops.version=1.3.1 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 23e5a2b29..6a03fd412 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.3.0 +LABEL io.webdevops.version=1.3.1 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 7491bbab9..548a0fba7 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile index 3b5c9f699..edddc4fef 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm/ubuntu-14.04/Dockerfile b/docker/hhvm/ubuntu-14.04/Dockerfile index 54f2f62fc..72ff567fc 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.3.0 +LABEL io.webdevops.version=1.3.1 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 897a0d544..46cfc8c8d 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/liquibase/latest/Dockerfile b/docker/liquibase/latest/Dockerfile index bdd6a388b..adbef72d9 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.3.0 +LABEL io.webdevops.version=1.3.1 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 eea95227a..c51c00f92 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.3.0 +LABEL io.webdevops.version=1.3.1 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 d3d8cb6d6..02c148f1e 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.3.0 +LABEL io.webdevops.version=1.3.1 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 26cfebd16..4f3962f78 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.3.0 +LABEL io.webdevops.version=1.3.1 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 9ed23cec9..94b21afe6 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.3.0 +LABEL io.webdevops.version=1.3.1 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 3b144ac70..d748215ae 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.3.0 +LABEL io.webdevops.version=1.3.1 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 a6e871732..83dafaa2d 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.3.0 +LABEL io.webdevops.version=1.3.1 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 f7e51d4e9..136035fe7 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.3.0 +LABEL io.webdevops.version=1.3.1 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 d826cc47f..aabd98b76 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.3.0 +LABEL io.webdevops.version=1.3.1 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 7eefdb5b4..af18191dc 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.3.0 +LABEL io.webdevops.version=1.3.1 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 66441e36a..0cafca153 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.3.0 +LABEL io.webdevops.version=1.3.1 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 987070fc9..e8eb552e9 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.3.0 +LABEL io.webdevops.version=1.3.1 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 8b323748d..fe3dcc492 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.3.0 +LABEL io.webdevops.version=1.3.1 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 17ebaccf5..6663b4dab 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.3.0 +LABEL io.webdevops.version=1.3.1 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 07426aca2..026365c34 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index 1f3f603f5..b2d86e2ee 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index d5c091c62..6b1ef556f 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index 532351dc7..b1333be94 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index 6472e0b8f..d1f9fde59 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index d0ab35764..2f96213ca 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index 69ed8bbfd..b9067ffe6 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index 3e2657bcd..ea5b7a428 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index ef18f5e73..9dbc5ac70 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index cfdd70526..1d8d03850 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/alpine-3-php7/Dockerfile b/docker/php-apache-dev/alpine-3-php7/Dockerfile index e20cf24e1..9640d2b06 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.3.0 +LABEL io.webdevops.version=1.3.1 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 52db8c217..138a9fb43 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.3.0 +LABEL io.webdevops.version=1.3.1 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 695c9a1aa..06e18bba0 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.3.0 +LABEL io.webdevops.version=1.3.1 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 445b4f292..59b222863 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.3.0 +LABEL io.webdevops.version=1.3.1 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 026a8eb3f..86fc8f1b4 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.3.0 +LABEL io.webdevops.version=1.3.1 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 49853f199..c37ee8ab7 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.3.0 +LABEL io.webdevops.version=1.3.1 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 9013d4ed9..19463ec44 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.3.0 +LABEL io.webdevops.version=1.3.1 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 fd780cc78..606c44394 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.3.0 +LABEL io.webdevops.version=1.3.1 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 2e74c9bfa..cd7eaddd3 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.3.0 +LABEL io.webdevops.version=1.3.1 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 b6e73dc49..41db1768c 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.3.0 +LABEL io.webdevops.version=1.3.1 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 a1dd13661..c5869b3f6 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.3.0 +LABEL io.webdevops.version=1.3.1 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 57cb07c77..2c93342dc 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.3.0 +LABEL io.webdevops.version=1.3.1 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 e2e68e517..fcf413f62 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.3.0 +LABEL io.webdevops.version=1.3.1 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 e064055d0..56cc93b26 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.3.0 +LABEL io.webdevops.version=1.3.1 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 5ad416ee2..1a41f3388 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.3.0 +LABEL io.webdevops.version=1.3.1 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 d1850c614..56af31417 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.3.0 +LABEL io.webdevops.version=1.3.1 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 3bc6c3952..f031e507d 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.3.0 +LABEL io.webdevops.version=1.3.1 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 a3deb54b3..4eebb6c24 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.3.0 +LABEL io.webdevops.version=1.3.1 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 009e7ae15..0a34b9ff5 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.3.0 +LABEL io.webdevops.version=1.3.1 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 c1381d9e3..51336f6f1 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.3.0 +LABEL io.webdevops.version=1.3.1 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 0f13bd74e..c023bd5e5 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.3.0 +LABEL io.webdevops.version=1.3.1 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 c858d3364..c43f5a665 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.3.0 +LABEL io.webdevops.version=1.3.1 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 66f30c1eb..a95e0b73d 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.3.0 +LABEL io.webdevops.version=1.3.1 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 58b31f50a..d7fbb7811 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.3.0 +LABEL io.webdevops.version=1.3.1 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 9b6f61dd0..5ae31da30 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.3.0 +LABEL io.webdevops.version=1.3.1 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 b90d0fcc2..6d54fc81b 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.3.0 +LABEL io.webdevops.version=1.3.1 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 0198366c6..409914341 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.3.0 +LABEL io.webdevops.version=1.3.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine-3/Dockerfile index fb808f322..44e59eaba 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.3.0 +LABEL io.webdevops.version=1.3.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index a7725bd01..eba3af6ff 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.3.0 +LABEL io.webdevops.version=1.3.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index e68cff722..f1357bc49 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.3.0 +LABEL io.webdevops.version=1.3.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index 43604beb9..d53d5a965 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.3.0 +LABEL io.webdevops.version=1.3.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index eae7cb6ba..90d7e9211 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.3.0 +LABEL io.webdevops.version=1.3.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index 2884914db..b690a8594 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.3.0 +LABEL io.webdevops.version=1.3.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 4e710a43f..8b357776c 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.3.0 +LABEL io.webdevops.version=1.3.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index 25c33e222..283f9dd73 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.3.0 +LABEL io.webdevops.version=1.3.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index 1c926cae2..a1428c3e1 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.3.0 +LABEL io.webdevops.version=1.3.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index 0e69a3afc..0f64a5ef9 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.3.0 +LABEL io.webdevops.version=1.3.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index 99d9ef836..28d60b09a 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.3.0 +LABEL io.webdevops.version=1.3.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index f26a220b9..9f1626082 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.3.0 +LABEL io.webdevops.version=1.3.1 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 97a955422..03aa9a043 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile b/docker/php-nginx-dev/alpine-3/Dockerfile index 2eb044cef..c5e1eaf63 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile index 19b07fc2f..dbf2acc0f 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index c5564fa1b..e2f9dc2b7 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index 309da09e0..c57482d0f 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index f1ab55f3e..90655a521 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index 13b5d7c64..675f88784 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index f73789e0c..ee71f5501 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index 8e669a203..76f3c5403 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index 47eb29e96..f2653838a 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index 58d64f0bd..fbe524c41 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index a9342edb7..c9f058a15 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index 297daf1de..1304abacd 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/alpine-3-php7/Dockerfile b/docker/php-nginx/alpine-3-php7/Dockerfile index 042fad739..cf17e3680 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/alpine-3/Dockerfile b/docker/php-nginx/alpine-3/Dockerfile index 8d47a82cd..857fd8e53 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index fbd4c39ce..0c44f62ef 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index e8f98591b..0369d8193 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index 83b72bbe9..9e2c85e80 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index e00f35175..f304dcd83 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index 508655021..8474bc2c3 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index d2b0636cf..351f0d28e 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index 163e0caf8..6c1fa2bed 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index 5112da09a..719c861c1 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index 8f50f0ba7..8eb54da90 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index bc1f12edc..d61db9543 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index e45af369d..293fc8b96 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/alpine-3-php7/Dockerfile b/docker/php/alpine-3-php7/Dockerfile index 52aa81f6b..f0be7aec3 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.3.0 +LABEL io.webdevops.version=1.3.1 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 e5efe63ca..36a21404f 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.3.0 +LABEL io.webdevops.version=1.3.1 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 1cef091e1..bdfa1c330 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.3.0 +LABEL io.webdevops.version=1.3.1 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 24032b59d..7b8c9608d 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.3.0 +LABEL io.webdevops.version=1.3.1 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 c41404f66..c1208eafc 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.3.0 +LABEL io.webdevops.version=1.3.1 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 e59686cec..a4ad248e0 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.3.0 +LABEL io.webdevops.version=1.3.1 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 616bc913a..7860fddf7 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.3.0 +LABEL io.webdevops.version=1.3.1 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 00cc93e43..f1cacda1e 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.3.0 +LABEL io.webdevops.version=1.3.1 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 53c0d0ebf..1860af9e2 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.3.0 +LABEL io.webdevops.version=1.3.1 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 99459ffaf..093097643 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.3.0 +LABEL io.webdevops.version=1.3.1 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 cd3852f10..06e639aec 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.3.0 +LABEL io.webdevops.version=1.3.1 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 35fe68852..2daa13b86 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.3.0 +LABEL io.webdevops.version=1.3.1 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 3a9bc6504..96a01c786 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.3.0 +LABEL io.webdevops.version=1.3.1 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 8068793f4..941a9874d 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.3.0 +LABEL io.webdevops.version=1.3.1 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 77c2909f8..8f4cd66c8 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.3.0 +LABEL io.webdevops.version=1.3.1 COPY conf/ /opt/docker/ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index a40b00d2a..8ebb77b97 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.3.0 +LABEL io.webdevops.version=1.3.1 ############################################################################### diff --git a/docker/samson-deployment/latest/conf/bin/config.sh b/docker/samson-deployment/latest/conf/bin/config.sh index 2ab34037d..3155728e8 100644 --- a/docker/samson-deployment/latest/conf/bin/config.sh +++ b/docker/samson-deployment/latest/conf/bin/config.sh @@ -60,10 +60,12 @@ function replaceTextInFile() { # ## function includeScriptDir() { - for FILE in "$1"/*.sh; do - # run custom scripts, only once - . "$FILE" - done + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + # run custom scripts, only once + . "$FILE" + done + fi } ### @@ -144,6 +146,7 @@ function runProvisionOnBuild() { ## function runProvisionEntrypoint() { includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" runDockerProvision entrypoint } diff --git a/docker/samson-deployment/latest/conf/bin/entrypoint.d/noop.sh b/docker/samson-deployment/latest/conf/bin/entrypoint.d/noop.sh index fac67d34b..967920837 100644 --- a/docker/samson-deployment/latest/conf/bin/entrypoint.d/noop.sh +++ b/docker/samson-deployment/latest/conf/bin/entrypoint.d/noop.sh @@ -4,7 +4,5 @@ ## NOOP (no operation) ############################################# -while true; do - sleep 1 -done +tail -f /dev/null exit diff --git a/docker/samson-deployment/latest/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/samson-deployment/latest/conf/bin/service.d/syslog-ng.d/10-init.sh index ee2efa6e1..0cae9494b 100644 --- a/docker/samson-deployment/latest/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/samson-deployment/latest/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -3,3 +3,8 @@ # then we remove it. if [ ! -S /dev/log ]; then rm -f /dev/log; fi if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf &> /dev/null +fi diff --git a/docker/samson-deployment/latest/conf/etc/supervisor.conf b/docker/samson-deployment/latest/conf/etc/supervisor.conf index 58094580d..7c109515a 100644 --- a/docker/samson-deployment/latest/conf/etc/supervisor.conf +++ b/docker/samson-deployment/latest/conf/etc/supervisor.conf @@ -3,6 +3,8 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock +# username = root +# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/samson-deployment/latest/conf/etc/syslog-ng/syslog-ng.conf b/docker/samson-deployment/latest/conf/etc/syslog-ng/syslog-ng.conf index 960677f9a..c69841581 100644 --- a/docker/samson-deployment/latest/conf/etc/syslog-ng/syslog-ng.conf +++ b/docker/samson-deployment/latest/conf/etc/syslog-ng/syslog-ng.conf @@ -1,18 +1,48 @@ @version: 3.5 -template t_isostamp { template("[SYSLOG] $MSGHDR$MSG\n"); }; - -options { file-template(t_isostamp); }; +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; -options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); - owner("root"); group("adm"); perm(0640); stats_freq(0); - bad_hostname("^gconfd$"); +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START }; source s_src { - unix-stream("/dev/log"); - internal(); + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END }; -destination d_all { pipe("/docker.stdout"); }; -log { source(s_src); destination(d_all); }; +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 0bcf102fe..8dfbf9665 100644 --- a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -1,8 +1,16 @@ --- -- name: Register logrotate configurations +- name: Create /entrypoint.d file: - src: '/opt/docker/provision/entrypoint.d' - dest: '/entrypoint.d' + path: "/entrypoint.d" + state: directory + owner: "root" + group: "root" + mode: 0700 + +- name: Create /entrypoint.cmd + file: + src: '/opt/docker/bin/entrypoint.d' + dest: '/entrypoint.cmd' state: link force: yes diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index 736f55a35..f052af1f8 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.3.0 +LABEL io.webdevops.version=1.3.1 RUN /usr/local/bin/apk-install \ # General sphinx diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index 5ce2208e3..6201289d8 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.3.0 +LABEL io.webdevops.version=1.3.1 RUN /opt/docker/bin/control.sh service.enable ssh diff --git a/docker/storage/latest/Dockerfile b/docker/storage/latest/Dockerfile index e63581812..1d2eb7109 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.3.0 +LABEL io.webdevops.version=1.3.1 RUN mkdir /storage/ \ && chmod 777 /storage/ diff --git a/docker/typo3/ubuntu-14.04/Dockerfile b/docker/typo3/ubuntu-14.04/Dockerfile index d7abc046b..9b309b16e 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV WEB_DOCUMENT_ROOT /app/web/ diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index cdc7c33a2..4033c04f4 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV VARNISH_PORT 80 diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index 8d5c47122..e74e02a9b 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.3.0 +LABEL io.webdevops.version=1.3.1 ENV FTP_USER application ENV FTP_PASSWORD application diff --git a/provisioning/base/alpine/etc/syslog-ng/syslog-ng.conf b/provisioning/base/alpine/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index 960677f9a..000000000 --- a/provisioning/base/alpine/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,18 +0,0 @@ -@version: 3.5 - -template t_isostamp { template("[SYSLOG] $MSGHDR$MSG\n"); }; - -options { file-template(t_isostamp); }; - -options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); - owner("root"); group("adm"); perm(0640); stats_freq(0); - bad_hostname("^gconfd$"); -}; - -source s_src { - unix-stream("/dev/log"); - internal(); -}; - -destination d_all { pipe("/docker.stdout"); }; -log { source(s_src); destination(d_all); }; diff --git a/provisioning/base/general/bin/config.sh b/provisioning/base/general/bin/config.sh index 2ab34037d..3155728e8 100644 --- a/provisioning/base/general/bin/config.sh +++ b/provisioning/base/general/bin/config.sh @@ -60,10 +60,12 @@ function replaceTextInFile() { # ## function includeScriptDir() { - for FILE in "$1"/*.sh; do - # run custom scripts, only once - . "$FILE" - done + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + # run custom scripts, only once + . "$FILE" + done + fi } ### @@ -144,6 +146,7 @@ function runProvisionOnBuild() { ## function runProvisionEntrypoint() { includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" runDockerProvision entrypoint } diff --git a/provisioning/base/general/bin/entrypoint.d/noop.sh b/provisioning/base/general/bin/entrypoint.d/noop.sh index fac67d34b..967920837 100644 --- a/provisioning/base/general/bin/entrypoint.d/noop.sh +++ b/provisioning/base/general/bin/entrypoint.d/noop.sh @@ -4,7 +4,5 @@ ## NOOP (no operation) ############################################# -while true; do - sleep 1 -done +tail -f /dev/null exit diff --git a/provisioning/base/general/bin/service.d/syslog-ng.d/10-init.sh b/provisioning/base/general/bin/service.d/syslog-ng.d/10-init.sh index ee2efa6e1..0cae9494b 100644 --- a/provisioning/base/general/bin/service.d/syslog-ng.d/10-init.sh +++ b/provisioning/base/general/bin/service.d/syslog-ng.d/10-init.sh @@ -3,3 +3,8 @@ # then we remove it. if [ ! -S /dev/log ]; then rm -f /dev/log; fi if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf &> /dev/null +fi diff --git a/provisioning/base/general/etc/supervisor.conf b/provisioning/base/general/etc/supervisor.conf index 58094580d..7c109515a 100644 --- a/provisioning/base/general/etc/supervisor.conf +++ b/provisioning/base/general/etc/supervisor.conf @@ -3,6 +3,8 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock +# username = root +# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/provisioning/base/general/etc/syslog-ng/syslog-ng.conf b/provisioning/base/general/etc/syslog-ng/syslog-ng.conf index 960677f9a..c69841581 100644 --- a/provisioning/base/general/etc/syslog-ng/syslog-ng.conf +++ b/provisioning/base/general/etc/syslog-ng/syslog-ng.conf @@ -1,18 +1,48 @@ @version: 3.5 -template t_isostamp { template("[SYSLOG] $MSGHDR$MSG\n"); }; - -options { file-template(t_isostamp); }; +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; -options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); - owner("root"); group("adm"); perm(0640); stats_freq(0); - bad_hostname("^gconfd$"); +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START }; source s_src { - unix-stream("/dev/log"); - internal(); + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END }; -destination d_all { pipe("/docker.stdout"); }; -log { source(s_src); destination(d_all); }; +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 0bcf102fe..8dfbf9665 100644 --- a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -1,8 +1,16 @@ --- -- name: Register logrotate configurations +- name: Create /entrypoint.d file: - src: '/opt/docker/provision/entrypoint.d' - dest: '/entrypoint.d' + path: "/entrypoint.d" + state: directory + owner: "root" + group: "root" + mode: 0700 + +- name: Create /entrypoint.cmd + file: + src: '/opt/docker/bin/entrypoint.d' + dest: '/entrypoint.cmd' state: link force: yes diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index 7b74821f7..1b2994320 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.3.0 +LABEL io.webdevops.version=1.3.1 {%- endmacro %} {%- macro add(source, target) -%}