From 7b88aa9bd2d2787b5ab53ffcd35e1738752cfa58 Mon Sep 17 00:00:00 2001 From: Todor Todorov Date: Sun, 15 Jan 2017 15:11:32 +0200 Subject: [PATCH 1/8] Created centos-7 image with php 7 using comunity repo https://centos7.iuscommunity.org/ius-release.rpm (#144) --- docker/php-nginx/centos-7-php70/Dockerfile | 36 +++++++++++++ .../centos-7-php70/Dockerfile.jinja2 | 12 +++++ .../conf/bin/service.d/nginx.d/10-init.sh | 20 ++++++++ .../conf/bin/service.d/nginx.sh | 7 +++ .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 ++ .../centos-7-php70/conf/etc/nginx/global.conf | 1 + .../centos-7-php70/conf/etc/nginx/main.conf | 4 ++ .../centos-7-php70/conf/etc/nginx/nginx.conf | 35 +++++++++++++ .../centos-7-php70/conf/etc/nginx/php.conf | 1 + .../conf/etc/nginx/ssl/server.crt | 28 ++++++++++ .../conf/etc/nginx/ssl/server.csr | 26 ++++++++++ .../conf/etc/nginx/ssl/server.key | 51 +++++++++++++++++++ .../conf/etc/nginx/vhost.common.conf | 2 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../vhost.common.d/10-location-root.conf | 3 ++ .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 +++ .../centos-7-php70/conf/etc/nginx/vhost.conf | 38 ++++++++++++++ .../conf/etc/nginx/vhost.ssl.conf | 7 +++ .../conf/etc/supervisor.d/nginx.conf | 14 +++++ .../roles/webdevops-nginx/defaults/main.yml | 3 ++ .../roles/webdevops-nginx/tasks/bootstrap.yml | 48 +++++++++++++++++ .../roles/webdevops-nginx/tasks/main.yml | 5 ++ .../webdevops-php-nginx/defaults/main.yml | 1 + .../webdevops-php-nginx/tasks/bootstrap.yml | 9 ++++ .../webdevops-php-nginx/tasks/entrypoint.yml | 2 + .../roles/webdevops-php-nginx/tasks/main.yml | 9 ++++ 27 files changed, 372 insertions(+) create mode 100644 docker/php-nginx/centos-7-php70/Dockerfile create mode 100644 docker/php-nginx/centos-7-php70/Dockerfile.jinja2 create mode 100644 docker/php-nginx/centos-7-php70/conf/bin/service.d/nginx.d/10-init.sh create mode 100644 docker/php-nginx/centos-7-php70/conf/bin/service.d/nginx.sh create mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/conf.d/.gitkeep create mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/conf.d/10-php.conf create mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/global.conf create mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/main.conf create mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/nginx.conf create mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/php.conf create mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.crt create mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.csr create mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.key create mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.conf create mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/10-php.conf create mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.conf create mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.ssl.conf create mode 100644 docker/php-nginx/centos-7-php70/conf/etc/supervisor.d/nginx.conf create mode 100644 docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/defaults/main.yml create mode 100644 docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml create mode 100644 docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/tasks/main.yml create mode 100644 docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/defaults/main.yml create mode 100644 docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml create mode 100644 docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml create mode 100644 docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/main.yml diff --git a/docker/php-nginx/centos-7-php70/Dockerfile b/docker/php-nginx/centos-7-php70/Dockerfile new file mode 100644 index 000000000..6725135ec --- /dev/null +++ b/docker/php-nginx/centos-7-php70/Dockerfile @@ -0,0 +1,36 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx:centos-7-php56 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:centos-7-php56 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.57.1 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 + +COPY conf/ /opt/docker/ + +# Remove php5 +RUN yum -y remove php* + +# Install php 7 +RUN wget https://centos7.iuscommunity.org/ius-release.rpm +RUN /usr/local/bin/yum-install ius-release.rpm +RUN /usr/local/bin/yum-install php70u-* + +# Install tools +RUN /usr/local/bin/yum-install \ + nginx \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ + && /opt/docker/bin/bootstrap.sh + +RUN rm ius-release.rpm + +EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7-php70/Dockerfile.jinja2 b/docker/php-nginx/centos-7-php70/Dockerfile.jinja2 new file mode 100644 index 000000000..846c1d4bf --- /dev/null +++ b/docker/php-nginx/centos-7-php70/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php", "centos-7-php70") }} + +{{ docker.version() }} + +{{ environment.web() }} +{{ environment.webPhp() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ nginx.centos('php-nginx') }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/centos-7-php70/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/centos-7-php70/conf/bin/service.d/nginx.d/10-init.sh new file mode 100644 index 000000000..656e19f64 --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/bin/service.d/nginx.d/10-init.sh @@ -0,0 +1,20 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Replace markers +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx/centos-7-php70/conf/bin/service.d/nginx.sh b/docker/php-nginx/centos-7-php70/conf/bin/service.d/nginx.sh new file mode 100644 index 000000000..f5cd26167 --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/bin/service.d/nginx.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/nginx.d/" + +exec /usr/sbin/nginx diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/centos-7-php70/conf/etc/nginx/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/centos-7-php70/conf/etc/nginx/conf.d/10-php.conf new file mode 100644 index 000000000..9abe45f0a --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/etc/nginx/conf.d/10-php.conf @@ -0,0 +1,3 @@ +upstream php { + server ; +} diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/global.conf b/docker/php-nginx/centos-7-php70/conf/etc/nginx/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/etc/nginx/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/main.conf b/docker/php-nginx/centos-7-php70/conf/etc/nginx/main.conf new file mode 100644 index 000000000..06de0651b --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/etc/nginx/main.conf @@ -0,0 +1,4 @@ +include /opt/docker/etc/nginx/global.conf; +include /opt/docker/etc/nginx/php.conf; +include /opt/docker/etc/nginx/conf.d/*.conf; +include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/nginx.conf b/docker/php-nginx/centos-7-php70/conf/etc/nginx/nginx.conf new file mode 100644 index 000000000..f5609826d --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/etc/nginx/nginx.conf @@ -0,0 +1,35 @@ +# For more information on configuration, see: +# * Official English Documentation: http://nginx.org/en/docs/ +# * Official Russian Documentation: http://nginx.org/ru/docs/ + +user nginx; +worker_processes auto; +error_log /var/log/nginx/error.log; +pid /run/nginx.pid; + +events { + worker_connections 1024; +} + +http { + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + # Load modular configuration files from the /etc/nginx/conf.d directory. + # See http://nginx.org/en/docs/ngx_core_module.html#include + # for more information. + include /etc/nginx/conf.d/*.conf; +} +daemon off; diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/php.conf b/docker/php-nginx/centos-7-php70/conf/etc/nginx/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/etc/nginx/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.key b/docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.conf new file mode 100644 index 000000000..a5df62ef8 --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.conf @@ -0,0 +1,2 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate +include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/10-location-root.conf new file mode 100644 index 000000000..28fd811bc --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -0,0 +1,3 @@ +location / { + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/10-php.conf new file mode 100644 index 000000000..274beac87 --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/10-php.conf @@ -0,0 +1,7 @@ +location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_read_timeout 1000; +} diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.conf b/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.conf new file mode 100644 index 000000000..33e10bfce --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.conf @@ -0,0 +1,38 @@ +server { + listen 80 default_server; + listen 8000 default_server; + + server_name _ docker; + + access_log /dev/stdout; + error_log /dev/stdout info; + + root ""; + index ; + + client_max_body_size 50m; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; +} + +############## +# SSL +############## + +server { + listen 443 default_server; + listen 8443 default_server; + + server_name _ docker; + + access_log /dev/stdout; + error_log /dev/stdout info; + + root ""; + index ; + + client_max_body_size 50m; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; + include /opt/docker/etc/nginx/vhost.ssl.conf; +} diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.ssl.conf new file mode 100644 index 000000000..4ddba251d --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.ssl.conf @@ -0,0 +1,7 @@ +ssl on; +ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive +ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; +ssl_prefer_server_ciphers on; + +ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; +ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/centos-7-php70/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/centos-7-php70/conf/etc/supervisor.d/nginx.conf new file mode 100644 index 000000000..657bf499b --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/etc/supervisor.d/nginx.conf @@ -0,0 +1,14 @@ +[group:nginx] +programs=nginxd +priority=20 + +[program:nginxd] +command = /opt/docker/bin/service.d/nginx.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/defaults/main.yml b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/defaults/main.yml new file mode 100644 index 000000000..69cba1cb4 --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/defaults/main.yml @@ -0,0 +1,3 @@ +--- + +DOCUMENT_ROOT: "{{ lookup('env','WEB_DOCUMENT_ROOT') }}" diff --git a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml new file mode 100644 index 000000000..ca34d3dd3 --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -0,0 +1,48 @@ +--- + +- name: Diable nginx demonize mode + lineinfile: + dest: /etc/nginx/nginx.conf + regexp: '[\s;]*{{ item.key }}[\s]*' + line: '{{ item.key }} {{ item.value }};' + with_items: + - { key: 'daemon', value: "off" } + +- name: Enable nginx main config + file: + src: '/opt/docker/etc/nginx/main.conf' + dest: '/etc/nginx/conf.d/10-docker.conf' + state: link + force: yes + +- name: Remove default vhost + file: + path: "/etc/nginx/sites-enabled/default" + state: absent + +- name: Replace default nginx.conf [RedHat/Alpine family] + file: + src: '/opt/docker/etc/nginx/nginx.conf' + dest: '/etc/nginx/nginx.conf' + state: link + force: yes + when: ansible_os_family == 'RedHat' or ansible_os_family == 'Alpine' + +- name: Ensure document root is available + file: + path: "{{ DOCUMENT_ROOT }}" + state: directory + recurse: yes + +- name: Fix rights of ssl files + file: + path: "{{ item.path }}" + state: "{{ item.state }}" + mode: "{{ item.mode }}" + owner: "root" + group: "root" + with_items: + - { path: '/opt/docker/etc/nginx/ssl', state: 'directory', mode: '0750' } + - { path: '/opt/docker/etc/nginx/ssl/server.crt', state: 'file', mode: '0640' } + - { path: '/opt/docker/etc/nginx/ssl/server.csr', state: 'file', mode: '0640' } + - { path: '/opt/docker/etc/nginx/ssl/server.key', state: 'file', mode: '0640' } diff --git a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/tasks/main.yml b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/defaults/main.yml b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/defaults/main.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/defaults/main.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml new file mode 100644 index 000000000..a2866e0d0 --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml @@ -0,0 +1,9 @@ +--- + +- name: Restrict php-fpm to local connection + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "127.0.0.1:9000" } diff --git a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/main.yml b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/main.yml new file mode 100644 index 000000000..7895a52a9 --- /dev/null +++ b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/main.yml @@ -0,0 +1,9 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap + +- include: entrypoint.yml + tags: + - entrypoint From 7a494924be8ae75462958d9cc701dcea8f246db3 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sun, 15 Jan 2017 14:16:30 +0100 Subject: [PATCH 2/8] Revert "Created centos-7 image with php 7 " (#158) --- docker/php-nginx/centos-7-php70/Dockerfile | 36 ------------- .../centos-7-php70/Dockerfile.jinja2 | 12 ----- .../conf/bin/service.d/nginx.d/10-init.sh | 20 -------- .../conf/bin/service.d/nginx.sh | 7 --- .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 -- .../centos-7-php70/conf/etc/nginx/global.conf | 1 - .../centos-7-php70/conf/etc/nginx/main.conf | 4 -- .../centos-7-php70/conf/etc/nginx/nginx.conf | 35 ------------- .../centos-7-php70/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 ---------- .../conf/etc/nginx/ssl/server.csr | 26 ---------- .../conf/etc/nginx/ssl/server.key | 51 ------------------- .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../vhost.common.d/10-location-root.conf | 3 -- .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 --- .../centos-7-php70/conf/etc/nginx/vhost.conf | 38 -------------- .../conf/etc/nginx/vhost.ssl.conf | 7 --- .../conf/etc/supervisor.d/nginx.conf | 14 ----- .../roles/webdevops-nginx/defaults/main.yml | 3 -- .../roles/webdevops-nginx/tasks/bootstrap.yml | 48 ----------------- .../roles/webdevops-nginx/tasks/main.yml | 5 -- .../webdevops-php-nginx/defaults/main.yml | 1 - .../webdevops-php-nginx/tasks/bootstrap.yml | 9 ---- .../webdevops-php-nginx/tasks/entrypoint.yml | 2 - .../roles/webdevops-php-nginx/tasks/main.yml | 9 ---- 27 files changed, 372 deletions(-) delete mode 100644 docker/php-nginx/centos-7-php70/Dockerfile delete mode 100644 docker/php-nginx/centos-7-php70/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/centos-7-php70/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/centos-7-php70/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/nginx.conf delete mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/centos-7-php70/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/defaults/main.yml delete mode 100644 docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml delete mode 100644 docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/tasks/main.yml delete mode 100644 docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/defaults/main.yml delete mode 100644 docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml delete mode 100644 docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml delete mode 100644 docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/main.yml diff --git a/docker/php-nginx/centos-7-php70/Dockerfile b/docker/php-nginx/centos-7-php70/Dockerfile deleted file mode 100644 index 6725135ec..000000000 --- a/docker/php-nginx/centos-7-php70/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:centos-7-php56 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:centos-7-php56 - -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.57.1 - -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm -ENV WEB_PHP_SOCKET 127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -# Remove php5 -RUN yum -y remove php* - -# Install php 7 -RUN wget https://centos7.iuscommunity.org/ius-release.rpm -RUN /usr/local/bin/yum-install ius-release.rpm -RUN /usr/local/bin/yum-install php70u-* - -# Install tools -RUN /usr/local/bin/yum-install \ - nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - -RUN rm ius-release.rpm - -EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7-php70/Dockerfile.jinja2 b/docker/php-nginx/centos-7-php70/Dockerfile.jinja2 deleted file mode 100644 index 846c1d4bf..000000000 --- a/docker/php-nginx/centos-7-php70/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php", "centos-7-php70") }} - -{{ docker.version() }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -{{ nginx.centos('php-nginx') }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/centos-7-php70/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/centos-7-php70/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 656e19f64..000000000 --- a/docker/php-nginx/centos-7-php70/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,20 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - -# Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" -else - ## WEB_PHP_SOCKET is not set, remove PHP files - rm /opt/docker/etc/nginx/conf.d/10-php.conf - rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/centos-7-php70/conf/bin/service.d/nginx.sh b/docker/php-nginx/centos-7-php70/conf/bin/service.d/nginx.sh deleted file mode 100644 index f5cd26167..000000000 --- a/docker/php-nginx/centos-7-php70/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/centos-7-php70/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/centos-7-php70/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/centos-7-php70/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/global.conf b/docker/php-nginx/centos-7-php70/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/centos-7-php70/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/main.conf b/docker/php-nginx/centos-7-php70/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/centos-7-php70/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/nginx.conf b/docker/php-nginx/centos-7-php70/conf/etc/nginx/nginx.conf deleted file mode 100644 index f5609826d..000000000 --- a/docker/php-nginx/centos-7-php70/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,35 +0,0 @@ -# For more information on configuration, see: -# * Official English Documentation: http://nginx.org/en/docs/ -# * Official Russian Documentation: http://nginx.org/ru/docs/ - -user nginx; -worker_processes auto; -error_log /var/log/nginx/error.log; -pid /run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - # Load modular configuration files from the /etc/nginx/conf.d directory. - # See http://nginx.org/en/docs/ngx_core_module.html#include - # for more information. - include /etc/nginx/conf.d/*.conf; -} -daemon off; diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/php.conf b/docker/php-nginx/centos-7-php70/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/centos-7-php70/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.key b/docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/centos-7-php70/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 274beac87..000000000 --- a/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout 1000; -} diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.conf b/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.conf deleted file mode 100644 index 33e10bfce..000000000 --- a/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,38 +0,0 @@ -server { - listen 80 default_server; - listen 8000 default_server; - - server_name _ docker; - - access_log /dev/stdout; - error_log /dev/stdout info; - - root ""; - index ; - - client_max_body_size 50m; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen 8443 default_server; - - server_name _ docker; - - access_log /dev/stdout; - error_log /dev/stdout info; - - root ""; - index ; - - client_max_body_size 50m; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/php-nginx/centos-7-php70/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/centos-7-php70/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/centos-7-php70/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/centos-7-php70/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/defaults/main.yml b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/defaults/main.yml deleted file mode 100644 index 69cba1cb4..000000000 --- a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/defaults/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -DOCUMENT_ROOT: "{{ lookup('env','WEB_DOCUMENT_ROOT') }}" diff --git a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml deleted file mode 100644 index ca34d3dd3..000000000 --- a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml +++ /dev/null @@ -1,48 +0,0 @@ ---- - -- name: Diable nginx demonize mode - lineinfile: - dest: /etc/nginx/nginx.conf - regexp: '[\s;]*{{ item.key }}[\s]*' - line: '{{ item.key }} {{ item.value }};' - with_items: - - { key: 'daemon', value: "off" } - -- name: Enable nginx main config - file: - src: '/opt/docker/etc/nginx/main.conf' - dest: '/etc/nginx/conf.d/10-docker.conf' - state: link - force: yes - -- name: Remove default vhost - file: - path: "/etc/nginx/sites-enabled/default" - state: absent - -- name: Replace default nginx.conf [RedHat/Alpine family] - file: - src: '/opt/docker/etc/nginx/nginx.conf' - dest: '/etc/nginx/nginx.conf' - state: link - force: yes - when: ansible_os_family == 'RedHat' or ansible_os_family == 'Alpine' - -- name: Ensure document root is available - file: - path: "{{ DOCUMENT_ROOT }}" - state: directory - recurse: yes - -- name: Fix rights of ssl files - file: - path: "{{ item.path }}" - state: "{{ item.state }}" - mode: "{{ item.mode }}" - owner: "root" - group: "root" - with_items: - - { path: '/opt/docker/etc/nginx/ssl', state: 'directory', mode: '0750' } - - { path: '/opt/docker/etc/nginx/ssl/server.crt', state: 'file', mode: '0640' } - - { path: '/opt/docker/etc/nginx/ssl/server.csr', state: 'file', mode: '0640' } - - { path: '/opt/docker/etc/nginx/ssl/server.key', state: 'file', mode: '0640' } diff --git a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/tasks/main.yml b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/tasks/main.yml deleted file mode 100644 index 1806c1a8c..000000000 --- a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-nginx/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap diff --git a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/defaults/main.yml b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/defaults/main.yml deleted file mode 100644 index ed97d539c..000000000 --- a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/defaults/main.yml +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml deleted file mode 100644 index a2866e0d0..000000000 --- a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Restrict php-fpm to local connection - lineinfile: - dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' - regexp: '^[\s;]*{{ item.key }}[\s]*=' - line: '{{ item.key }} = {{ item.value }}' - with_items: - - { key: 'listen', value: "127.0.0.1:9000" } diff --git a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml deleted file mode 100644 index cd21505a4..000000000 --- a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- - diff --git a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/main.yml b/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/main.yml deleted file mode 100644 index 7895a52a9..000000000 --- a/docker/php-nginx/centos-7-php70/conf/provision/roles/webdevops-php-nginx/tasks/main.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap - -- include: entrypoint.yml - tags: - - entrypoint From eb68efe5deaf0149cbb1c84c8185dc35a9e65c83 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sun, 15 Jan 2017 23:24:40 +0100 Subject: [PATCH 3/8] Enable ssh in php-*dev images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Enable ssh - Set root and application to “dev” --- conf/provision.yml | 1 + docker/php-dev/alpine-3-php7/Dockerfile | 2 +- .../roles/webdevops-dev/defaults/main.yml | 7 +++++++ .../roles/webdevops-dev/tasks/bootstrap.yml | 20 +++++++++++++++++++ .../roles/webdevops-dev/tasks/main.yml | 5 +++++ docker/php-dev/alpine-3/Dockerfile | 2 +- .../roles/webdevops-dev/defaults/main.yml | 7 +++++++ .../roles/webdevops-dev/tasks/bootstrap.yml | 20 +++++++++++++++++++ .../roles/webdevops-dev/tasks/main.yml | 5 +++++ docker/php-dev/centos-7-php56/Dockerfile | 2 +- .../roles/webdevops-dev/defaults/main.yml | 7 +++++++ .../roles/webdevops-dev/tasks/bootstrap.yml | 20 +++++++++++++++++++ .../roles/webdevops-dev/tasks/main.yml | 5 +++++ docker/php-dev/centos-7/Dockerfile | 2 +- .../roles/webdevops-dev/defaults/main.yml | 7 +++++++ .../roles/webdevops-dev/tasks/bootstrap.yml | 20 +++++++++++++++++++ .../roles/webdevops-dev/tasks/main.yml | 5 +++++ docker/php-dev/debian-7/Dockerfile | 2 +- .../roles/webdevops-dev/defaults/main.yml | 7 +++++++ .../roles/webdevops-dev/tasks/bootstrap.yml | 20 +++++++++++++++++++ .../roles/webdevops-dev/tasks/main.yml | 5 +++++ docker/php-dev/debian-8-php7/Dockerfile | 2 +- .../roles/webdevops-dev/defaults/main.yml | 7 +++++++ .../roles/webdevops-dev/tasks/bootstrap.yml | 20 +++++++++++++++++++ .../roles/webdevops-dev/tasks/main.yml | 5 +++++ docker/php-dev/debian-8/Dockerfile | 2 +- .../roles/webdevops-dev/defaults/main.yml | 7 +++++++ .../roles/webdevops-dev/tasks/bootstrap.yml | 20 +++++++++++++++++++ .../roles/webdevops-dev/tasks/main.yml | 5 +++++ docker/php-dev/debian-9/Dockerfile | 2 +- .../roles/webdevops-dev/defaults/main.yml | 7 +++++++ .../roles/webdevops-dev/tasks/bootstrap.yml | 20 +++++++++++++++++++ .../roles/webdevops-dev/tasks/main.yml | 5 +++++ docker/php-dev/ubuntu-12.04/Dockerfile | 2 +- .../roles/webdevops-dev/defaults/main.yml | 7 +++++++ .../roles/webdevops-dev/tasks/bootstrap.yml | 20 +++++++++++++++++++ .../roles/webdevops-dev/tasks/main.yml | 5 +++++ docker/php-dev/ubuntu-14.04/Dockerfile | 2 +- .../roles/webdevops-dev/defaults/main.yml | 7 +++++++ .../roles/webdevops-dev/tasks/bootstrap.yml | 20 +++++++++++++++++++ .../roles/webdevops-dev/tasks/main.yml | 5 +++++ docker/php-dev/ubuntu-15.04/Dockerfile | 2 +- .../roles/webdevops-dev/defaults/main.yml | 7 +++++++ .../roles/webdevops-dev/tasks/bootstrap.yml | 20 +++++++++++++++++++ .../roles/webdevops-dev/tasks/main.yml | 5 +++++ docker/php-dev/ubuntu-15.10/Dockerfile | 2 +- .../roles/webdevops-dev/defaults/main.yml | 7 +++++++ .../roles/webdevops-dev/tasks/bootstrap.yml | 20 +++++++++++++++++++ .../roles/webdevops-dev/tasks/main.yml | 5 +++++ docker/php-dev/ubuntu-16.04/Dockerfile | 2 +- .../roles/webdevops-dev/defaults/main.yml | 7 +++++++ .../roles/webdevops-dev/tasks/bootstrap.yml | 20 +++++++++++++++++++ .../roles/webdevops-dev/tasks/main.yml | 5 +++++ .../roles/webdevops-dev/defaults/main.yml | 7 +++++++ .../roles/webdevops-dev/tasks/bootstrap.yml | 20 +++++++++++++++++++ .../roles/webdevops-dev/tasks/main.yml | 5 +++++ template/Dockerfile/images/php5-dev.jinja2 | 10 +++++----- template/Dockerfile/images/php7-dev.jinja2 | 12 +++++------ 58 files changed, 473 insertions(+), 24 deletions(-) create mode 100644 docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/defaults/main.yml create mode 100644 docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/tasks/main.yml create mode 100644 docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/defaults/main.yml create mode 100644 docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/tasks/main.yml create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-dev/defaults/main.yml create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-dev/tasks/main.yml create mode 100644 docker/php-dev/centos-7/conf/provision/roles/webdevops-dev/defaults/main.yml create mode 100644 docker/php-dev/centos-7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/centos-7/conf/provision/roles/webdevops-dev/tasks/main.yml create mode 100644 docker/php-dev/debian-7/conf/provision/roles/webdevops-dev/defaults/main.yml create mode 100644 docker/php-dev/debian-7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/debian-7/conf/provision/roles/webdevops-dev/tasks/main.yml create mode 100644 docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-dev/defaults/main.yml create mode 100644 docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-dev/tasks/main.yml create mode 100644 docker/php-dev/debian-8/conf/provision/roles/webdevops-dev/defaults/main.yml create mode 100644 docker/php-dev/debian-8/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/debian-8/conf/provision/roles/webdevops-dev/tasks/main.yml create mode 100644 docker/php-dev/debian-9/conf/provision/roles/webdevops-dev/defaults/main.yml create mode 100644 docker/php-dev/debian-9/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/debian-9/conf/provision/roles/webdevops-dev/tasks/main.yml create mode 100644 docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-dev/defaults/main.yml create mode 100644 docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-dev/tasks/main.yml create mode 100644 docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-dev/defaults/main.yml create mode 100644 docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-dev/tasks/main.yml create mode 100644 docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-dev/defaults/main.yml create mode 100644 docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-dev/tasks/main.yml create mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-dev/defaults/main.yml create mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-dev/tasks/main.yml create mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-dev/defaults/main.yml create mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-dev/tasks/main.yml create mode 100644 provisioning/development/general/provision/roles/webdevops-dev/defaults/main.yml create mode 100644 provisioning/development/general/provision/roles/webdevops-dev/tasks/bootstrap.yml create mode 100644 provisioning/development/general/provision/roles/webdevops-dev/tasks/main.yml diff --git a/conf/provision.yml b/conf/provision.yml index ca87d653f..f9096b960 100644 --- a/conf/provision.yml +++ b/conf/provision.yml @@ -63,6 +63,7 @@ provision: php-dev: configuration: php-dev/general : '*' + development/general: '*' php-apache-dev: configuration: apache/general : '*' diff --git a/docker/php-dev/alpine-3-php7/Dockerfile b/docker/php-dev/alpine-3-php7/Dockerfile index b5fc25d4f..bcdbf101b 100644 --- a/docker/php-dev/alpine-3-php7/Dockerfile +++ b/docker/php-dev/alpine-3-php7/Dockerfile @@ -18,6 +18,6 @@ RUN /usr/local/bin/apk-install \ graphviz \ # Install php development stuff php7-xdebug \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/defaults/main.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/defaults/main.yml new file mode 100644 index 000000000..4406ea8b4 --- /dev/null +++ b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" +APPLICATION_PASSWORD: "dev" diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..5c9eafbd0 --- /dev/null +++ b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -0,0 +1,20 @@ +--- + +- name: Enable ssh daemon + shell: "/opt/docker/bin/control.sh service.enable ssh" + +- name: Set application user password + user: + name: "{{ APPLICATION_USER }}" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Set root password + user: + name: "root" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Enable ssh root access + lineinfile: + dest: /etc/ssh/sshd_config + regexp: '^PermitRootLogin' + line: 'PermitRootLogin yes' diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/tasks/main.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine-3/Dockerfile index e55df0812..511db903b 100644 --- a/docker/php-dev/alpine-3/Dockerfile +++ b/docker/php-dev/alpine-3/Dockerfile @@ -18,6 +18,6 @@ RUN /usr/local/bin/apk-install \ graphviz \ # Install php development stuff php5-xdebug \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/defaults/main.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/defaults/main.yml new file mode 100644 index 000000000..4406ea8b4 --- /dev/null +++ b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" +APPLICATION_PASSWORD: "dev" diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..5c9eafbd0 --- /dev/null +++ b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -0,0 +1,20 @@ +--- + +- name: Enable ssh daemon + shell: "/opt/docker/bin/control.sh service.enable ssh" + +- name: Set application user password + user: + name: "{{ APPLICATION_USER }}" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Set root password + user: + name: "root" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Enable ssh root access + lineinfile: + dest: /etc/ssh/sshd_config + regexp: '^PermitRootLogin' + line: 'PermitRootLogin yes' diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/tasks/main.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index 829e02c60..0cc2fe3ce 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -20,6 +20,6 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php56w-pecl-xdebug \ blackfire-php \ blackfire-agent \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-dev/defaults/main.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-dev/defaults/main.yml new file mode 100644 index 000000000..4406ea8b4 --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-dev/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" +APPLICATION_PASSWORD: "dev" diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..5c9eafbd0 --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -0,0 +1,20 @@ +--- + +- name: Enable ssh daemon + shell: "/opt/docker/bin/control.sh service.enable ssh" + +- name: Set application user password + user: + name: "{{ APPLICATION_USER }}" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Set root password + user: + name: "root" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Enable ssh root access + lineinfile: + dest: /etc/ssh/sshd_config + regexp: '^PermitRootLogin' + line: 'PermitRootLogin yes' diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-dev/tasks/main.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index 1b111f3cd..0bf14e6cc 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -21,6 +21,6 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php-pecl-xdebug \ blackfire-php \ blackfire-agent \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-dev/defaults/main.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-dev/defaults/main.yml new file mode 100644 index 000000000..4406ea8b4 --- /dev/null +++ b/docker/php-dev/centos-7/conf/provision/roles/webdevops-dev/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" +APPLICATION_PASSWORD: "dev" diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..5c9eafbd0 --- /dev/null +++ b/docker/php-dev/centos-7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -0,0 +1,20 @@ +--- + +- name: Enable ssh daemon + shell: "/opt/docker/bin/control.sh service.enable ssh" + +- name: Set application user password + user: + name: "{{ APPLICATION_USER }}" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Set root password + user: + name: "root" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Enable ssh root access + lineinfile: + dest: /etc/ssh/sshd_config + regexp: '^PermitRootLogin' + line: 'PermitRootLogin yes' diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-dev/tasks/main.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/centos-7/conf/provision/roles/webdevops-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index c6cec6b8e..688a1521c 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -22,6 +22,6 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-dev/defaults/main.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-dev/defaults/main.yml new file mode 100644 index 000000000..4406ea8b4 --- /dev/null +++ b/docker/php-dev/debian-7/conf/provision/roles/webdevops-dev/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" +APPLICATION_PASSWORD: "dev" diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..5c9eafbd0 --- /dev/null +++ b/docker/php-dev/debian-7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -0,0 +1,20 @@ +--- + +- name: Enable ssh daemon + shell: "/opt/docker/bin/control.sh service.enable ssh" + +- name: Set application user password + user: + name: "{{ APPLICATION_USER }}" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Set root password + user: + name: "root" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Enable ssh root access + lineinfile: + dest: /etc/ssh/sshd_config + regexp: '^PermitRootLogin' + line: 'PermitRootLogin yes' diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-dev/tasks/main.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/debian-7/conf/provision/roles/webdevops-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index feafe158a..b8afee20e 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -22,6 +22,6 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ # php7.0-xdebug \ # Is currently not available blackfire-php \ blackfire-agent \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-dev/defaults/main.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-dev/defaults/main.yml new file mode 100644 index 000000000..4406ea8b4 --- /dev/null +++ b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-dev/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" +APPLICATION_PASSWORD: "dev" diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..5c9eafbd0 --- /dev/null +++ b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -0,0 +1,20 @@ +--- + +- name: Enable ssh daemon + shell: "/opt/docker/bin/control.sh service.enable ssh" + +- name: Set application user password + user: + name: "{{ APPLICATION_USER }}" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Set root password + user: + name: "root" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Enable ssh root access + lineinfile: + dest: /etc/ssh/sshd_config + regexp: '^PermitRootLogin' + line: 'PermitRootLogin yes' diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-dev/tasks/main.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index 9351cc17b..d5693190c 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -22,6 +22,6 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-dev/defaults/main.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-dev/defaults/main.yml new file mode 100644 index 000000000..4406ea8b4 --- /dev/null +++ b/docker/php-dev/debian-8/conf/provision/roles/webdevops-dev/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" +APPLICATION_PASSWORD: "dev" diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..5c9eafbd0 --- /dev/null +++ b/docker/php-dev/debian-8/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -0,0 +1,20 @@ +--- + +- name: Enable ssh daemon + shell: "/opt/docker/bin/control.sh service.enable ssh" + +- name: Set application user password + user: + name: "{{ APPLICATION_USER }}" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Set root password + user: + name: "root" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Enable ssh root access + lineinfile: + dest: /etc/ssh/sshd_config + regexp: '^PermitRootLogin' + line: 'PermitRootLogin yes' diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-dev/tasks/main.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/debian-8/conf/provision/roles/webdevops-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 2e5048ad9..bf92c9aa2 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -22,6 +22,6 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php-xdebug \ blackfire-php \ blackfire-agent \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-dev/defaults/main.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-dev/defaults/main.yml new file mode 100644 index 000000000..4406ea8b4 --- /dev/null +++ b/docker/php-dev/debian-9/conf/provision/roles/webdevops-dev/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" +APPLICATION_PASSWORD: "dev" diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..5c9eafbd0 --- /dev/null +++ b/docker/php-dev/debian-9/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -0,0 +1,20 @@ +--- + +- name: Enable ssh daemon + shell: "/opt/docker/bin/control.sh service.enable ssh" + +- name: Set application user password + user: + name: "{{ APPLICATION_USER }}" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Set root password + user: + name: "root" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Enable ssh root access + lineinfile: + dest: /etc/ssh/sshd_config + regexp: '^PermitRootLogin' + line: 'PermitRootLogin yes' diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-dev/tasks/main.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/debian-9/conf/provision/roles/webdevops-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index 43e280918..0318b6856 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -22,6 +22,6 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-dev/defaults/main.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-dev/defaults/main.yml new file mode 100644 index 000000000..4406ea8b4 --- /dev/null +++ b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-dev/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" +APPLICATION_PASSWORD: "dev" diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..5c9eafbd0 --- /dev/null +++ b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -0,0 +1,20 @@ +--- + +- name: Enable ssh daemon + shell: "/opt/docker/bin/control.sh service.enable ssh" + +- name: Set application user password + user: + name: "{{ APPLICATION_USER }}" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Set root password + user: + name: "root" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Enable ssh root access + lineinfile: + dest: /etc/ssh/sshd_config + regexp: '^PermitRootLogin' + line: 'PermitRootLogin yes' diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-dev/tasks/main.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index 83bbac355..a88c828df 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -22,6 +22,6 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-dev/defaults/main.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-dev/defaults/main.yml new file mode 100644 index 000000000..4406ea8b4 --- /dev/null +++ b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-dev/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" +APPLICATION_PASSWORD: "dev" diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..5c9eafbd0 --- /dev/null +++ b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -0,0 +1,20 @@ +--- + +- name: Enable ssh daemon + shell: "/opt/docker/bin/control.sh service.enable ssh" + +- name: Set application user password + user: + name: "{{ APPLICATION_USER }}" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Set root password + user: + name: "root" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Enable ssh root access + lineinfile: + dest: /etc/ssh/sshd_config + regexp: '^PermitRootLogin' + line: 'PermitRootLogin yes' diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-dev/tasks/main.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index f3daa1ecc..785f0edb0 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -22,6 +22,6 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-dev/defaults/main.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-dev/defaults/main.yml new file mode 100644 index 000000000..4406ea8b4 --- /dev/null +++ b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-dev/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" +APPLICATION_PASSWORD: "dev" diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..5c9eafbd0 --- /dev/null +++ b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -0,0 +1,20 @@ +--- + +- name: Enable ssh daemon + shell: "/opt/docker/bin/control.sh service.enable ssh" + +- name: Set application user password + user: + name: "{{ APPLICATION_USER }}" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Set root password + user: + name: "root" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Enable ssh root access + lineinfile: + dest: /etc/ssh/sshd_config + regexp: '^PermitRootLogin' + line: 'PermitRootLogin yes' diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-dev/tasks/main.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index 90b07b539..a6af7bac8 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -22,6 +22,6 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-dev/defaults/main.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-dev/defaults/main.yml new file mode 100644 index 000000000..4406ea8b4 --- /dev/null +++ b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-dev/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" +APPLICATION_PASSWORD: "dev" diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..5c9eafbd0 --- /dev/null +++ b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -0,0 +1,20 @@ +--- + +- name: Enable ssh daemon + shell: "/opt/docker/bin/control.sh service.enable ssh" + +- name: Set application user password + user: + name: "{{ APPLICATION_USER }}" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Set root password + user: + name: "root" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Enable ssh root access + lineinfile: + dest: /etc/ssh/sshd_config + regexp: '^PermitRootLogin' + line: 'PermitRootLogin yes' diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-dev/tasks/main.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 8418ca9e0..8a8748e99 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -22,6 +22,6 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php-xdebug \ blackfire-php \ blackfire-agent \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-dev/defaults/main.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-dev/defaults/main.yml new file mode 100644 index 000000000..4406ea8b4 --- /dev/null +++ b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-dev/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" +APPLICATION_PASSWORD: "dev" diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..5c9eafbd0 --- /dev/null +++ b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -0,0 +1,20 @@ +--- + +- name: Enable ssh daemon + shell: "/opt/docker/bin/control.sh service.enable ssh" + +- name: Set application user password + user: + name: "{{ APPLICATION_USER }}" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Set root password + user: + name: "root" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Enable ssh root access + lineinfile: + dest: /etc/ssh/sshd_config + regexp: '^PermitRootLogin' + line: 'PermitRootLogin yes' diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-dev/tasks/main.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/provisioning/development/general/provision/roles/webdevops-dev/defaults/main.yml b/provisioning/development/general/provision/roles/webdevops-dev/defaults/main.yml new file mode 100644 index 000000000..4406ea8b4 --- /dev/null +++ b/provisioning/development/general/provision/roles/webdevops-dev/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" +APPLICATION_PASSWORD: "dev" diff --git a/provisioning/development/general/provision/roles/webdevops-dev/tasks/bootstrap.yml b/provisioning/development/general/provision/roles/webdevops-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..5c9eafbd0 --- /dev/null +++ b/provisioning/development/general/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -0,0 +1,20 @@ +--- + +- name: Enable ssh daemon + shell: "/opt/docker/bin/control.sh service.enable ssh" + +- name: Set application user password + user: + name: "{{ APPLICATION_USER }}" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Set root password + user: + name: "root" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Enable ssh root access + lineinfile: + dest: /etc/ssh/sshd_config + regexp: '^PermitRootLogin' + line: 'PermitRootLogin yes' diff --git a/provisioning/development/general/provision/roles/webdevops-dev/tasks/main.yml b/provisioning/development/general/provision/roles/webdevops-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/provisioning/development/general/provision/roles/webdevops-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/template/Dockerfile/images/php5-dev.jinja2 b/template/Dockerfile/images/php5-dev.jinja2 index 1dee37af6..ee3892e03 100644 --- a/template/Dockerfile/images/php5-dev.jinja2 +++ b/template/Dockerfile/images/php5-dev.jinja2 @@ -7,7 +7,7 @@ RUN /usr/local/bin/apk-install \ graphviz \ # Install php development stuff php5-xdebug \ - {{ provision.runRoleInline('php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} {%- endmacro %} @@ -21,7 +21,7 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php-pecl-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} {%- endmacro %} {% macro webtatic(role='') -%} @@ -33,7 +33,7 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php56w-pecl-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} {%- endmacro %} {% macro debian(role='') -%} @@ -47,7 +47,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} {%- endmacro %} @@ -62,5 +62,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} {%- endmacro %} diff --git a/template/Dockerfile/images/php7-dev.jinja2 b/template/Dockerfile/images/php7-dev.jinja2 index cfb8eb1a3..9596eadde 100644 --- a/template/Dockerfile/images/php7-dev.jinja2 +++ b/template/Dockerfile/images/php7-dev.jinja2 @@ -7,7 +7,7 @@ RUN /usr/local/bin/apk-install \ graphviz \ # Install php development stuff php7-xdebug \ - {{ provision.runRoleInline('php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} {%- endmacro %} @@ -21,7 +21,7 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php7-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} {%- endmacro %} @@ -36,7 +36,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} {%- endmacro %} {% macro debianDotDeb(role='') -%} @@ -50,7 +50,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php7.0-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} {%- endmacro %} {% macro debianSury(role='') -%} @@ -64,7 +64,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ # php7.0-xdebug \ # Is currently not available blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} {%- endmacro %} {% macro ubuntu(role='') -%} @@ -78,5 +78,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} {%- endmacro %} From a6d62e2a8f10af29b1d8b5d9a964354f8efbd78d Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Thu, 19 Jan 2017 22:50:00 +0100 Subject: [PATCH 4/8] Set debian-9 distribution version to 9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Was “testing” before, docker image now changed to 9 --- conf/console.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/console.yml b/conf/console.yml index 60145dda2..ce162c082 100644 --- a/conf/console.yml +++ b/conf/console.yml @@ -76,7 +76,7 @@ dockerTest: PHP_XDEBUG: '0' ':debian-9': OS_FAMILY: 'debian' - OS_VERSION: 'testing' + OS_VERSION: '9' ':centos-7': OS_FAMILY: 'redhat' OS_VERSION: '7' From abd545c3a29b8bd9746ee97affabb8b139198d0d Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Thu, 19 Jan 2017 23:31:00 +0100 Subject: [PATCH 5/8] Add test for php-dev with ssh --- tests/serverspec/spec/collection/development.rb | 9 +++++++++ tests/serverspec/spec/docker/php-dev_spec.rb | 1 + 2 files changed, 10 insertions(+) create mode 100644 tests/serverspec/spec/collection/development.rb diff --git a/tests/serverspec/spec/collection/development.rb b/tests/serverspec/spec/collection/development.rb new file mode 100644 index 000000000..0d76e26c3 --- /dev/null +++ b/tests/serverspec/spec/collection/development.rb @@ -0,0 +1,9 @@ +shared_examples 'collection::development' do + + # services + include_examples 'ssh::listening::public' + + # test after services are up + include_examples 'ssh::service::running' + +end diff --git a/tests/serverspec/spec/docker/php-dev_spec.rb b/tests/serverspec/spec/docker/php-dev_spec.rb index 43360b3a2..c18f86b5e 100644 --- a/tests/serverspec/spec/docker/php-dev_spec.rb +++ b/tests/serverspec/spec/docker/php-dev_spec.rb @@ -23,5 +23,6 @@ end include_examples 'collection::php-tools' + include_examples 'collection::development' end From 7f428bca0095ca6e9e3b392323d7abf709d3c815 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Thu, 19 Jan 2017 23:42:10 +0100 Subject: [PATCH 6/8] Generate sshd host keys if needed --- docker/base-app/alpine-3/conf/bin/service.d/ssh.d/10-init.sh | 3 ++- docker/base-app/centos-7/conf/bin/service.d/ssh.d/10-init.sh | 3 ++- docker/base-app/debian-7/conf/bin/service.d/ssh.d/10-init.sh | 3 ++- docker/base-app/debian-8/conf/bin/service.d/ssh.d/10-init.sh | 3 ++- docker/base-app/debian-9/conf/bin/service.d/ssh.d/10-init.sh | 3 ++- .../base-app/ubuntu-12.04/conf/bin/service.d/ssh.d/10-init.sh | 3 ++- .../base-app/ubuntu-14.04/conf/bin/service.d/ssh.d/10-init.sh | 3 ++- .../base-app/ubuntu-15.04/conf/bin/service.d/ssh.d/10-init.sh | 3 ++- .../base-app/ubuntu-15.10/conf/bin/service.d/ssh.d/10-init.sh | 3 ++- .../base-app/ubuntu-16.04/conf/bin/service.d/ssh.d/10-init.sh | 3 ++- .../latest/conf/bin/service.d/ssh.d/10-init.sh | 3 ++- provisioning/base-app/general/bin/service.d/ssh.d/10-init.sh | 3 ++- 12 files changed, 24 insertions(+), 12 deletions(-) diff --git a/docker/base-app/alpine-3/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/alpine-3/conf/bin/service.d/ssh.d/10-init.sh index fdffa2a0f..e3192fe01 100644 --- a/docker/base-app/alpine-3/conf/bin/service.d/ssh.d/10-init.sh +++ b/docker/base-app/alpine-3/conf/bin/service.d/ssh.d/10-init.sh @@ -1 +1,2 @@ -# placeholder +# generate host keys +ssh-keygen -A diff --git a/docker/base-app/centos-7/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/centos-7/conf/bin/service.d/ssh.d/10-init.sh index fdffa2a0f..e3192fe01 100644 --- a/docker/base-app/centos-7/conf/bin/service.d/ssh.d/10-init.sh +++ b/docker/base-app/centos-7/conf/bin/service.d/ssh.d/10-init.sh @@ -1 +1,2 @@ -# placeholder +# generate host keys +ssh-keygen -A diff --git a/docker/base-app/debian-7/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/debian-7/conf/bin/service.d/ssh.d/10-init.sh index fdffa2a0f..e3192fe01 100644 --- a/docker/base-app/debian-7/conf/bin/service.d/ssh.d/10-init.sh +++ b/docker/base-app/debian-7/conf/bin/service.d/ssh.d/10-init.sh @@ -1 +1,2 @@ -# placeholder +# generate host keys +ssh-keygen -A diff --git a/docker/base-app/debian-8/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/debian-8/conf/bin/service.d/ssh.d/10-init.sh index fdffa2a0f..e3192fe01 100644 --- a/docker/base-app/debian-8/conf/bin/service.d/ssh.d/10-init.sh +++ b/docker/base-app/debian-8/conf/bin/service.d/ssh.d/10-init.sh @@ -1 +1,2 @@ -# placeholder +# generate host keys +ssh-keygen -A diff --git a/docker/base-app/debian-9/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/debian-9/conf/bin/service.d/ssh.d/10-init.sh index fdffa2a0f..e3192fe01 100644 --- a/docker/base-app/debian-9/conf/bin/service.d/ssh.d/10-init.sh +++ b/docker/base-app/debian-9/conf/bin/service.d/ssh.d/10-init.sh @@ -1 +1,2 @@ -# placeholder +# generate host keys +ssh-keygen -A diff --git a/docker/base-app/ubuntu-12.04/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/ubuntu-12.04/conf/bin/service.d/ssh.d/10-init.sh index fdffa2a0f..e3192fe01 100644 --- a/docker/base-app/ubuntu-12.04/conf/bin/service.d/ssh.d/10-init.sh +++ b/docker/base-app/ubuntu-12.04/conf/bin/service.d/ssh.d/10-init.sh @@ -1 +1,2 @@ -# placeholder +# generate host keys +ssh-keygen -A diff --git a/docker/base-app/ubuntu-14.04/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/ubuntu-14.04/conf/bin/service.d/ssh.d/10-init.sh index fdffa2a0f..e3192fe01 100644 --- a/docker/base-app/ubuntu-14.04/conf/bin/service.d/ssh.d/10-init.sh +++ b/docker/base-app/ubuntu-14.04/conf/bin/service.d/ssh.d/10-init.sh @@ -1 +1,2 @@ -# placeholder +# generate host keys +ssh-keygen -A diff --git a/docker/base-app/ubuntu-15.04/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/ubuntu-15.04/conf/bin/service.d/ssh.d/10-init.sh index fdffa2a0f..e3192fe01 100644 --- a/docker/base-app/ubuntu-15.04/conf/bin/service.d/ssh.d/10-init.sh +++ b/docker/base-app/ubuntu-15.04/conf/bin/service.d/ssh.d/10-init.sh @@ -1 +1,2 @@ -# placeholder +# generate host keys +ssh-keygen -A diff --git a/docker/base-app/ubuntu-15.10/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/ubuntu-15.10/conf/bin/service.d/ssh.d/10-init.sh index fdffa2a0f..e3192fe01 100644 --- a/docker/base-app/ubuntu-15.10/conf/bin/service.d/ssh.d/10-init.sh +++ b/docker/base-app/ubuntu-15.10/conf/bin/service.d/ssh.d/10-init.sh @@ -1 +1,2 @@ -# placeholder +# generate host keys +ssh-keygen -A diff --git a/docker/base-app/ubuntu-16.04/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/ubuntu-16.04/conf/bin/service.d/ssh.d/10-init.sh index fdffa2a0f..e3192fe01 100644 --- a/docker/base-app/ubuntu-16.04/conf/bin/service.d/ssh.d/10-init.sh +++ b/docker/base-app/ubuntu-16.04/conf/bin/service.d/ssh.d/10-init.sh @@ -1 +1,2 @@ -# placeholder +# generate host keys +ssh-keygen -A diff --git a/docker/samson-deployment/latest/conf/bin/service.d/ssh.d/10-init.sh b/docker/samson-deployment/latest/conf/bin/service.d/ssh.d/10-init.sh index fdffa2a0f..e3192fe01 100644 --- a/docker/samson-deployment/latest/conf/bin/service.d/ssh.d/10-init.sh +++ b/docker/samson-deployment/latest/conf/bin/service.d/ssh.d/10-init.sh @@ -1 +1,2 @@ -# placeholder +# generate host keys +ssh-keygen -A diff --git a/provisioning/base-app/general/bin/service.d/ssh.d/10-init.sh b/provisioning/base-app/general/bin/service.d/ssh.d/10-init.sh index fdffa2a0f..e3192fe01 100644 --- a/provisioning/base-app/general/bin/service.d/ssh.d/10-init.sh +++ b/provisioning/base-app/general/bin/service.d/ssh.d/10-init.sh @@ -1 +1,2 @@ -# placeholder +# generate host keys +ssh-keygen -A From 282f6d620ddbba9a35e88c3a0ae602765217f5b8 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Fri, 20 Jan 2017 00:08:36 +0100 Subject: [PATCH 7/8] Use pipe as syslog destination instead of file --- docker/base/alpine-3/conf/etc/syslog-ng/syslog-ng.conf | 2 +- docker/base/centos-7/conf/etc/syslog-ng/syslog-ng.conf | 2 +- docker/base/debian-7/conf/etc/syslog-ng/syslog-ng.conf | 2 +- docker/base/debian-8/conf/etc/syslog-ng/syslog-ng.conf | 2 +- docker/base/debian-9/conf/etc/syslog-ng/syslog-ng.conf | 2 +- docker/base/ubuntu-12.04/conf/etc/syslog-ng/syslog-ng.conf | 2 +- docker/base/ubuntu-14.04/conf/etc/syslog-ng/syslog-ng.conf | 2 +- docker/base/ubuntu-15.04/conf/etc/syslog-ng/syslog-ng.conf | 2 +- docker/base/ubuntu-15.10/conf/etc/syslog-ng/syslog-ng.conf | 2 +- docker/base/ubuntu-16.04/conf/etc/syslog-ng/syslog-ng.conf | 2 +- .../samson-deployment/latest/conf/etc/syslog-ng/syslog-ng.conf | 2 +- provisioning/base/alpine/etc/syslog-ng/syslog-ng.conf | 2 +- provisioning/base/general/etc/syslog-ng/syslog-ng.conf | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) 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 adda3e8c5..960677f9a 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 @@ -14,5 +14,5 @@ source s_src { internal(); }; -destination d_all { file("/docker.stdout"); }; +destination d_all { pipe("/docker.stdout"); }; log { source(s_src); destination(d_all); }; 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 adda3e8c5..960677f9a 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 @@ -14,5 +14,5 @@ source s_src { internal(); }; -destination d_all { file("/docker.stdout"); }; +destination d_all { pipe("/docker.stdout"); }; log { source(s_src); destination(d_all); }; 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 adda3e8c5..960677f9a 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 @@ -14,5 +14,5 @@ source s_src { internal(); }; -destination d_all { file("/docker.stdout"); }; +destination d_all { pipe("/docker.stdout"); }; log { source(s_src); destination(d_all); }; 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 adda3e8c5..960677f9a 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 @@ -14,5 +14,5 @@ source s_src { internal(); }; -destination d_all { file("/docker.stdout"); }; +destination d_all { pipe("/docker.stdout"); }; log { source(s_src); destination(d_all); }; 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 adda3e8c5..960677f9a 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 @@ -14,5 +14,5 @@ source s_src { internal(); }; -destination d_all { file("/docker.stdout"); }; +destination d_all { pipe("/docker.stdout"); }; log { source(s_src); destination(d_all); }; 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 adda3e8c5..960677f9a 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 @@ -14,5 +14,5 @@ source s_src { internal(); }; -destination d_all { file("/docker.stdout"); }; +destination d_all { pipe("/docker.stdout"); }; log { source(s_src); destination(d_all); }; 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 adda3e8c5..960677f9a 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 @@ -14,5 +14,5 @@ source s_src { internal(); }; -destination d_all { file("/docker.stdout"); }; +destination d_all { pipe("/docker.stdout"); }; log { source(s_src); destination(d_all); }; 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 adda3e8c5..960677f9a 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 @@ -14,5 +14,5 @@ source s_src { internal(); }; -destination d_all { file("/docker.stdout"); }; +destination d_all { pipe("/docker.stdout"); }; log { source(s_src); destination(d_all); }; 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 adda3e8c5..960677f9a 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 @@ -14,5 +14,5 @@ source s_src { internal(); }; -destination d_all { file("/docker.stdout"); }; +destination d_all { pipe("/docker.stdout"); }; log { source(s_src); destination(d_all); }; 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 adda3e8c5..960677f9a 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 @@ -14,5 +14,5 @@ source s_src { internal(); }; -destination d_all { file("/docker.stdout"); }; +destination d_all { pipe("/docker.stdout"); }; log { source(s_src); destination(d_all); }; 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 adda3e8c5..960677f9a 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 @@ -14,5 +14,5 @@ source s_src { internal(); }; -destination d_all { file("/docker.stdout"); }; +destination d_all { pipe("/docker.stdout"); }; log { source(s_src); destination(d_all); }; diff --git a/provisioning/base/alpine/etc/syslog-ng/syslog-ng.conf b/provisioning/base/alpine/etc/syslog-ng/syslog-ng.conf index adda3e8c5..960677f9a 100644 --- a/provisioning/base/alpine/etc/syslog-ng/syslog-ng.conf +++ b/provisioning/base/alpine/etc/syslog-ng/syslog-ng.conf @@ -14,5 +14,5 @@ source s_src { internal(); }; -destination d_all { file("/docker.stdout"); }; +destination d_all { pipe("/docker.stdout"); }; log { source(s_src); destination(d_all); }; diff --git a/provisioning/base/general/etc/syslog-ng/syslog-ng.conf b/provisioning/base/general/etc/syslog-ng/syslog-ng.conf index adda3e8c5..960677f9a 100644 --- a/provisioning/base/general/etc/syslog-ng/syslog-ng.conf +++ b/provisioning/base/general/etc/syslog-ng/syslog-ng.conf @@ -14,5 +14,5 @@ source s_src { internal(); }; -destination d_all { file("/docker.stdout"); }; +destination d_all { pipe("/docker.stdout"); }; log { source(s_src); destination(d_all); }; From c86b5d5348a6f2decc508f27c706158a4c1da6b9 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Fri, 20 Jan 2017 00:41:25 +0100 Subject: [PATCH 8/8] Release 1.2.4 --- CHANGELOG.md | 6 ++++++ docker/ansible/alpine-3/Dockerfile | 2 +- docker/ansible/centos-7/Dockerfile | 2 +- docker/ansible/debian-7/Dockerfile | 2 +- docker/ansible/debian-8/Dockerfile | 2 +- docker/ansible/debian-9/Dockerfile | 2 +- docker/ansible/ubuntu-12.04/Dockerfile | 2 +- docker/ansible/ubuntu-14.04/Dockerfile | 2 +- docker/ansible/ubuntu-15.04/Dockerfile | 2 +- docker/ansible/ubuntu-15.10/Dockerfile | 2 +- docker/ansible/ubuntu-16.04/Dockerfile | 2 +- docker/apache-dev/alpine-3/Dockerfile | 2 +- docker/apache-dev/centos-7/Dockerfile | 2 +- docker/apache-dev/debian-7/Dockerfile | 2 +- docker/apache-dev/debian-8/Dockerfile | 2 +- docker/apache-dev/debian-9/Dockerfile | 2 +- docker/apache-dev/ubuntu-12.04/Dockerfile | 2 +- docker/apache-dev/ubuntu-14.04/Dockerfile | 2 +- docker/apache-dev/ubuntu-15.04/Dockerfile | 2 +- docker/apache-dev/ubuntu-15.10/Dockerfile | 2 +- docker/apache-dev/ubuntu-16.04/Dockerfile | 2 +- docker/apache/alpine-3/Dockerfile | 2 +- docker/apache/centos-7/Dockerfile | 2 +- docker/apache/debian-7/Dockerfile | 2 +- docker/apache/debian-8/Dockerfile | 2 +- docker/apache/debian-9/Dockerfile | 2 +- docker/apache/ubuntu-12.04/Dockerfile | 2 +- docker/apache/ubuntu-14.04/Dockerfile | 2 +- docker/apache/ubuntu-15.04/Dockerfile | 2 +- docker/apache/ubuntu-15.10/Dockerfile | 2 +- docker/apache/ubuntu-16.04/Dockerfile | 2 +- docker/base-app/alpine-3/Dockerfile | 2 +- docker/base-app/centos-7/Dockerfile | 2 +- docker/base-app/debian-7/Dockerfile | 2 +- docker/base-app/debian-8/Dockerfile | 2 +- docker/base-app/debian-9/Dockerfile | 2 +- docker/base-app/ubuntu-12.04/Dockerfile | 2 +- docker/base-app/ubuntu-14.04/Dockerfile | 2 +- docker/base-app/ubuntu-15.04/Dockerfile | 2 +- docker/base-app/ubuntu-15.10/Dockerfile | 2 +- docker/base-app/ubuntu-16.04/Dockerfile | 2 +- docker/base/alpine-3/Dockerfile | 2 +- docker/base/centos-7/Dockerfile | 2 +- docker/base/debian-7/Dockerfile | 2 +- docker/base/debian-8/Dockerfile | 2 +- docker/base/debian-9/Dockerfile | 2 +- docker/base/ubuntu-12.04/Dockerfile | 2 +- docker/base/ubuntu-14.04/Dockerfile | 2 +- docker/base/ubuntu-15.04/Dockerfile | 2 +- docker/base/ubuntu-15.10/Dockerfile | 2 +- docker/base/ubuntu-16.04/Dockerfile | 2 +- docker/bootstrap/alpine-3/Dockerfile | 2 +- docker/bootstrap/centos-7/Dockerfile | 2 +- docker/bootstrap/debian-7/Dockerfile | 2 +- docker/bootstrap/debian-8/Dockerfile | 2 +- docker/bootstrap/debian-9/Dockerfile | 2 +- docker/bootstrap/ubuntu-12.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-14.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-15.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-15.10/Dockerfile | 2 +- docker/bootstrap/ubuntu-16.04/Dockerfile | 2 +- docker/certbot/latest/Dockerfile | 2 +- docker/hhvm-apache/ubuntu-14.04/Dockerfile | 2 +- docker/hhvm-apache/ubuntu-16.04/Dockerfile | 2 +- docker/hhvm-nginx/ubuntu-14.04/Dockerfile | 2 +- docker/hhvm-nginx/ubuntu-16.04/Dockerfile | 2 +- docker/hhvm/ubuntu-14.04/Dockerfile | 2 +- docker/hhvm/ubuntu-16.04/Dockerfile | 2 +- docker/liquibase/latest/Dockerfile | 2 +- docker/liquibase/mysql/Dockerfile | 2 +- docker/liquibase/postgres/Dockerfile | 2 +- docker/mail-sandbox/latest/Dockerfile | 2 +- docker/nginx-dev/alpine-3/Dockerfile | 2 +- docker/nginx-dev/centos-7/Dockerfile | 2 +- docker/nginx-dev/debian-7/Dockerfile | 2 +- docker/nginx-dev/debian-8/Dockerfile | 2 +- docker/nginx-dev/debian-9/Dockerfile | 2 +- docker/nginx-dev/ubuntu-12.04/Dockerfile | 2 +- docker/nginx-dev/ubuntu-14.04/Dockerfile | 2 +- docker/nginx-dev/ubuntu-15.04/Dockerfile | 2 +- docker/nginx-dev/ubuntu-15.10/Dockerfile | 2 +- docker/nginx-dev/ubuntu-16.04/Dockerfile | 2 +- docker/nginx/alpine-3/Dockerfile | 2 +- docker/nginx/centos-7/Dockerfile | 2 +- docker/nginx/debian-7/Dockerfile | 2 +- docker/nginx/debian-8/Dockerfile | 2 +- docker/nginx/debian-9/Dockerfile | 2 +- docker/nginx/ubuntu-12.04/Dockerfile | 2 +- docker/nginx/ubuntu-14.04/Dockerfile | 2 +- docker/nginx/ubuntu-15.04/Dockerfile | 2 +- docker/nginx/ubuntu-15.10/Dockerfile | 2 +- docker/nginx/ubuntu-16.04/Dockerfile | 2 +- docker/php-apache-dev/alpine-3-php7/Dockerfile | 2 +- docker/php-apache-dev/alpine-3/Dockerfile | 2 +- docker/php-apache-dev/centos-7-php56/Dockerfile | 2 +- docker/php-apache-dev/centos-7/Dockerfile | 2 +- docker/php-apache-dev/debian-7/Dockerfile | 2 +- docker/php-apache-dev/debian-8-php7/Dockerfile | 2 +- docker/php-apache-dev/debian-8/Dockerfile | 2 +- docker/php-apache-dev/debian-9/Dockerfile | 2 +- docker/php-apache-dev/ubuntu-12.04/Dockerfile | 2 +- docker/php-apache-dev/ubuntu-14.04/Dockerfile | 2 +- docker/php-apache-dev/ubuntu-15.04/Dockerfile | 2 +- docker/php-apache-dev/ubuntu-15.10/Dockerfile | 2 +- docker/php-apache-dev/ubuntu-16.04/Dockerfile | 2 +- docker/php-apache/alpine-3-php7/Dockerfile | 2 +- docker/php-apache/alpine-3/Dockerfile | 2 +- docker/php-apache/centos-7-php56/Dockerfile | 2 +- docker/php-apache/centos-7/Dockerfile | 2 +- docker/php-apache/debian-7/Dockerfile | 2 +- docker/php-apache/debian-8-php7/Dockerfile | 2 +- docker/php-apache/debian-8/Dockerfile | 2 +- docker/php-apache/debian-9/Dockerfile | 2 +- docker/php-apache/ubuntu-12.04/Dockerfile | 2 +- docker/php-apache/ubuntu-14.04/Dockerfile | 2 +- docker/php-apache/ubuntu-15.04/Dockerfile | 2 +- docker/php-apache/ubuntu-15.10/Dockerfile | 2 +- docker/php-apache/ubuntu-16.04/Dockerfile | 2 +- docker/php-dev/alpine-3-php7/Dockerfile | 2 +- docker/php-dev/alpine-3/Dockerfile | 2 +- docker/php-dev/centos-7-php56/Dockerfile | 2 +- docker/php-dev/centos-7/Dockerfile | 2 +- docker/php-dev/debian-7/Dockerfile | 2 +- docker/php-dev/debian-8-php7/Dockerfile | 2 +- docker/php-dev/debian-8/Dockerfile | 2 +- docker/php-dev/debian-9/Dockerfile | 2 +- docker/php-dev/ubuntu-12.04/Dockerfile | 2 +- docker/php-dev/ubuntu-14.04/Dockerfile | 2 +- docker/php-dev/ubuntu-15.04/Dockerfile | 2 +- docker/php-dev/ubuntu-15.10/Dockerfile | 2 +- docker/php-dev/ubuntu-16.04/Dockerfile | 2 +- docker/php-nginx-dev/alpine-3-php7/Dockerfile | 2 +- docker/php-nginx-dev/alpine-3/Dockerfile | 2 +- docker/php-nginx-dev/centos-7-php56/Dockerfile | 2 +- docker/php-nginx-dev/centos-7/Dockerfile | 2 +- docker/php-nginx-dev/debian-7/Dockerfile | 2 +- docker/php-nginx-dev/debian-8-php7/Dockerfile | 2 +- docker/php-nginx-dev/debian-8/Dockerfile | 2 +- docker/php-nginx-dev/debian-9/Dockerfile | 2 +- docker/php-nginx-dev/ubuntu-12.04/Dockerfile | 2 +- docker/php-nginx-dev/ubuntu-14.04/Dockerfile | 2 +- docker/php-nginx-dev/ubuntu-15.04/Dockerfile | 2 +- docker/php-nginx-dev/ubuntu-15.10/Dockerfile | 2 +- docker/php-nginx-dev/ubuntu-16.04/Dockerfile | 2 +- docker/php-nginx/alpine-3-php7/Dockerfile | 2 +- docker/php-nginx/alpine-3/Dockerfile | 2 +- docker/php-nginx/centos-7-php56/Dockerfile | 2 +- docker/php-nginx/centos-7/Dockerfile | 2 +- docker/php-nginx/debian-7/Dockerfile | 2 +- docker/php-nginx/debian-8-php7/Dockerfile | 2 +- docker/php-nginx/debian-8/Dockerfile | 2 +- docker/php-nginx/debian-9/Dockerfile | 2 +- docker/php-nginx/ubuntu-12.04/Dockerfile | 2 +- docker/php-nginx/ubuntu-14.04/Dockerfile | 2 +- docker/php-nginx/ubuntu-15.04/Dockerfile | 2 +- docker/php-nginx/ubuntu-15.10/Dockerfile | 2 +- docker/php-nginx/ubuntu-16.04/Dockerfile | 2 +- docker/php/alpine-3-php7/Dockerfile | 2 +- docker/php/alpine-3/Dockerfile | 2 +- docker/php/centos-7-php56/Dockerfile | 2 +- docker/php/centos-7/Dockerfile | 2 +- docker/php/debian-7/Dockerfile | 2 +- docker/php/debian-8-php7/Dockerfile | 2 +- docker/php/debian-8/Dockerfile | 2 +- docker/php/debian-9/Dockerfile | 2 +- docker/php/ubuntu-12.04/Dockerfile | 2 +- docker/php/ubuntu-14.04/Dockerfile | 2 +- docker/php/ubuntu-15.04/Dockerfile | 2 +- docker/php/ubuntu-15.10/Dockerfile | 2 +- docker/php/ubuntu-16.04/Dockerfile | 2 +- docker/piwik/ubuntu-14.04/Dockerfile | 2 +- docker/postfix/latest/Dockerfile | 2 +- docker/samson-deployment/latest/Dockerfile | 2 +- docker/sphinx/latest/Dockerfile | 2 +- docker/ssh/latest/Dockerfile | 2 +- docker/storage/latest/Dockerfile | 2 +- docker/typo3/ubuntu-14.04/Dockerfile | 2 +- docker/varnish/latest/Dockerfile | 2 +- docker/vsftp/latest/Dockerfile | 2 +- template/Dockerfile/docker.jinja2 | 2 +- 180 files changed, 185 insertions(+), 179 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db24b9cf0..27d8cea23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/Dockerfile). +## [1.2.4] - 2017-01-20 +- Enable sshd for php-dev images +- Set root and application password of php-dev images to "dev" +- Fixed syslog-ng error message about log file destination (use pipe instead of file) +- Fixed test of debian-9 (distribution version is now "9", was "testing" before; upstream) + ## [1.2.3] - 2017-01-10 - Removed default nginx vhost configuration (configuration collision) for alpine diff --git a/docker/ansible/alpine-3/Dockerfile b/docker/ansible/alpine-3/Dockerfile index ecc3a23c2..5d07f9d19 100644 --- a/docker/ansible/alpine-3/Dockerfile +++ b/docker/ansible/alpine-3/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index cceb8d1b8..2da5247ae 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index 58a4f39c1..4afae943b 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index 8d1128c8c..5c1189d4f 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index fde5c14ef..309a13270 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index d60dab9a0..551ce20e7 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index 05d8d8a16..8730ad554 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index 5c5ec85d4..510420de0 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index 1047826c3..389083991 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index bc1439d0f..59c1efdc5 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 diff --git a/docker/apache-dev/alpine-3/Dockerfile b/docker/apache-dev/alpine-3/Dockerfile index a63ebd840..b03c5bc48 100644 --- a/docker/apache-dev/alpine-3/Dockerfile +++ b/docker/apache-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 0281a1566..c96b91e8c 100644 --- a/docker/apache-dev/centos-7/Dockerfile +++ b/docker/apache-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 aa410fb99..363d45ff7 100644 --- a/docker/apache-dev/debian-7/Dockerfile +++ b/docker/apache-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 b730a1515..4cd34252b 100644 --- a/docker/apache-dev/debian-8/Dockerfile +++ b/docker/apache-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 5a76875e1..c2ed8391f 100644 --- a/docker/apache-dev/debian-9/Dockerfile +++ b/docker/apache-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 117015c11..9adb00a72 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 510ce743f..71c1285f2 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 7481fc68c..f1f3e1225 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 c37653435..0f999c03a 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 63740940f..8e8bb3241 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 13cccffdd..83c9600df 100644 --- a/docker/apache/alpine-3/Dockerfile +++ b/docker/apache/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 d5cdc4d38..541d75308 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 e4b8ec105..757671162 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 60d5177a8..76f2d9a36 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 7749dad39..48981f0aa 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 cca64d2dc..6517a5a9c 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 2d01d1541..cd47abc78 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 fb97fc847..c57508b18 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 215dd2c3f..a7784a7a7 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 477e96e45..6625f046c 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 4f4f5c80c..21b21240f 100644 --- a/docker/base-app/alpine-3/Dockerfile +++ b/docker/base-app/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 a6445e758..ee9e7f625 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 70629d658..b680bdf68 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 1d40df5f8..b9d3c1c04 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 0da75f55d..bcda2b732 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 d2999d0e1..993fe4210 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 6ed6e610d..e2860f6ba 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 6ed7d1ff8..a4433dee5 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 fd1e5b290..ae55ff5e0 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 9d570d35c..7ab655be5 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile index a3ba86008..a03694efc 100644 --- a/docker/base/alpine-3/Dockerfile +++ b/docker/base/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 33177dbb2..93eb8d1b4 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index 859ef25c0..caa179533 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index e45f27013..7e8df2870 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 697787209..8c9ebc061 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index e6aa0fae7..2d63a78bf 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 0f220afa0..36ebf3c7e 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index fb6a39ccb..be925b814 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 182214dbb..c5a3bbaf3 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index 899e065a3..0e3f0c7d3 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index 0c4df9930..22078db95 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM alpine:3.5 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 7231295c6..f1d4970e8 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM centos:7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index 821b3d8b1..cef8b30f9 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM debian:7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 6e39e929d..2a416b84c 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM debian:8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 655cb6592..fdf0f7b96 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM debian:stretch MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 # 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 b655ee24d..07c3c1966 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 # 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 14eceb75f..738095301 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 # 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 28ada459d..20f4d49fe 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 # 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 c6ad9b2a0..b83142346 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 # 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 5de5d979e..2a76c1099 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile index f3b5a0eeb..3c1e770c2 100644 --- a/docker/certbot/latest/Dockerfile +++ b/docker/certbot/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 7472bd085..d10f92855 100644 --- a/docker/hhvm-apache/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 da711a75c..892a49b33 100644 --- a/docker/hhvm-apache/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 e860dd67a..236c3da4b 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 b6d6d32a4..d7b72ec37 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 75c313ce0..8a29d7171 100644 --- a/docker/hhvm/ubuntu-14.04/Dockerfile +++ b/docker/hhvm/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 423924d1d..ff7d318eb 100644 --- a/docker/hhvm/ubuntu-16.04/Dockerfile +++ b/docker/hhvm/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/liquibase/latest/Dockerfile b/docker/liquibase/latest/Dockerfile index db22e3dd0..5beb0e867 100644 --- a/docker/liquibase/latest/Dockerfile +++ b/docker/liquibase/latest/Dockerfile @@ -8,7 +8,7 @@ FROM java:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 7cf4a6f98..4abc1dcc3 100644 --- a/docker/liquibase/mysql/Dockerfile +++ b/docker/liquibase/mysql/Dockerfile @@ -8,7 +8,7 @@ FROM java:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 16da7f54f..5cf03fe5c 100644 --- a/docker/liquibase/postgres/Dockerfile +++ b/docker/liquibase/postgres/Dockerfile @@ -8,7 +8,7 @@ FROM java:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 0fb4dad6b..a266b4773 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-nginx:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 f532ed7f4..53d270a92 100644 --- a/docker/nginx-dev/alpine-3/Dockerfile +++ b/docker/nginx-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 ae69c95e2..25df11dc3 100644 --- a/docker/nginx-dev/centos-7/Dockerfile +++ b/docker/nginx-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 1f0a81946..460ae19b6 100644 --- a/docker/nginx-dev/debian-7/Dockerfile +++ b/docker/nginx-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 80eac357f..a2b31fcfb 100644 --- a/docker/nginx-dev/debian-8/Dockerfile +++ b/docker/nginx-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 fc4fb0e6a..eba08089b 100644 --- a/docker/nginx-dev/debian-9/Dockerfile +++ b/docker/nginx-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 bd90a44a0..c2889e3b7 100644 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 0f758583a..1baa00d8d 100644 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 0715bc7f1..ec0973fde 100644 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 cfe0d76c6..95225a45a 100644 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 94760e397..52dfdb406 100644 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 6ec988cd0..2731b4f7a 100644 --- a/docker/nginx/alpine-3/Dockerfile +++ b/docker/nginx/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 21d826db2..d9286cc5f 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 82966c3ea..00b1fff4d 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 7dd400e05..93bf27ae3 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 8c52f8394..deb75b91a 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 c638e659b..4487c538a 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 a63612d80..ea7c12423 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 3ecbae97d..587a67980 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 9752b696e..fb663d665 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 7540ca9d8..712237f74 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 157085c51..b1dbf7fec 100644 --- a/docker/php-apache-dev/alpine-3-php7/Dockerfile +++ b/docker/php-apache-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 9c410a67a..a490b8eb2 100644 --- a/docker/php-apache-dev/alpine-3/Dockerfile +++ b/docker/php-apache-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 2063ec290..40e294592 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 caf46a4cb..7bf9b9f3c 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 9cc8bcd40..53da42b94 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 852decd46..4f7508356 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 92d9adc12..6bae1ebfb 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 32651f634..64bf46e98 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 b7f06e7aa..176333546 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 54a7e1c0b..f8f0d0364 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 8fe02398d..3a114ccf9 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 02e19f49f..ffd782d60 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 cb6c8e580..bbebda939 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 e2c61a0ca..e52773120 100644 --- a/docker/php-apache/alpine-3-php7/Dockerfile +++ b/docker/php-apache/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 9b3e780ba..2f01a4751 100644 --- a/docker/php-apache/alpine-3/Dockerfile +++ b/docker/php-apache/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 1b3b83a4d..0e265bd23 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 fee02a078..9496871ac 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 27dd40daf..14eba71dc 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 4cf27d237..b584bf985 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 2159b21d4..a99ebd6e8 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 87823b0b5..ea7eb4c9e 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 4b17c22bd..e9229773e 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 fbd25d237..bb64f7eae 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 56582ad2b..9a84e281e 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 31835f7e5..0c5e971f3 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 db8c09c03..aec677e91 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 bcdbf101b..d5d3223f5 100644 --- a/docker/php-dev/alpine-3-php7/Dockerfile +++ b/docker/php-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine-3/Dockerfile index 511db903b..c826e5f7d 100644 --- a/docker/php-dev/alpine-3/Dockerfile +++ b/docker/php-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index 0cc2fe3ce..8beadb2ff 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index 0bf14e6cc..d6ea9fc72 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index 688a1521c..2f26b8aac 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index b8afee20e..c026d0a03 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index d5693190c..62de3697c 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index bf92c9aa2..a4a656a4d 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index 0318b6856..0d99aa7b7 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index a88c828df..158ba62eb 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index 785f0edb0..823082ebe 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index a6af7bac8..d4a4105a6 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 8a8748e99..c99db9111 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 e03df506e..eabefa420 100644 --- a/docker/php-nginx-dev/alpine-3-php7/Dockerfile +++ b/docker/php-nginx-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 e2231a230..448eba2ba 100644 --- a/docker/php-nginx-dev/alpine-3/Dockerfile +++ b/docker/php-nginx-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 a47425e5b..e5578b849 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 757ad30d6..eb71cfbc0 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 d5e1455a1..3841a7cc4 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 04b7ec0dd..ae5c69734 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 f4708b1ce..e6e6d1988 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 94ff7fe95..bc67e6630 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 d8082ee84..6fce97e5b 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 db5915271..6b6eb19a6 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 ca3b6e316..7eaf0dd37 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 e1b3b2186..1ac5b531b 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 fd5842f2f..01008fa8f 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 bba66d459..23f9162e4 100644 --- a/docker/php-nginx/alpine-3-php7/Dockerfile +++ b/docker/php-nginx/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 08e66132f..278d199bf 100644 --- a/docker/php-nginx/alpine-3/Dockerfile +++ b/docker/php-nginx/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 1ae715f7e..e0f41ba20 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 4a5e58a8b..f7ae0e8e4 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 60d8fc5d9..6c3ae8d5d 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 6cf3bcc8f..20ab74798 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 4d91acd9c..9b2abc120 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 7a30f794b..f4ebbab5a 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 9d6ef219c..c0f5b9bea 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 5166af31f..f5b378441 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 3ad4b77a3..227535e16 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 30d408846..3c3ae5461 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 ce0eccb08..e3bdfe00d 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 c709c8804..0cf5aabbd 100644 --- a/docker/php/alpine-3-php7/Dockerfile +++ b/docker/php/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 67a92d5a5..e284bd7a9 100644 --- a/docker/php/alpine-3/Dockerfile +++ b/docker/php/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 260418071..dee9f60a0 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 7fcf1f449..b5fc6e0bd 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 32876eb86..1ad1c8580 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 068a1d09e..92377beab 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 59ad0dcf9..bfb09b717 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 21c9e3354..bf9aa9b3c 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 ce4a6266d..5b40265e5 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 27d736543..8fe99a8d4 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 a9a7b9ac2..98aa7a03b 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 d57793626..7903cf5b6 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 326c6a6ef..18fda9c17 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 dac4c4574..a1cd31f0c 100644 --- a/docker/piwik/ubuntu-14.04/Dockerfile +++ b/docker/piwik/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-nginx:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 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 37e5250dc..688ddfea4 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 COPY conf/ /opt/docker/ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index c02ed427b..c19e8ea32 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -8,7 +8,7 @@ FROM zendesk/samson:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 ############################################################################### diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index 3be2d093c..ec3161801 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 RUN /usr/local/bin/apk-install \ # General sphinx diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index 9448b97e9..4579a3975 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 RUN /opt/docker/bin/control.sh service.enable ssh diff --git a/docker/storage/latest/Dockerfile b/docker/storage/latest/Dockerfile index f4ec9a460..e362f1840 100644 --- a/docker/storage/latest/Dockerfile +++ b/docker/storage/latest/Dockerfile @@ -8,7 +8,7 @@ FROM busybox:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 RUN mkdir /storage/ \ && chmod 777 /storage/ diff --git a/docker/typo3/ubuntu-14.04/Dockerfile b/docker/typo3/ubuntu-14.04/Dockerfile index 02d775df0..a90853622 100644 --- a/docker/typo3/ubuntu-14.04/Dockerfile +++ b/docker/typo3/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-apache:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 ENV WEB_DOCUMENT_ROOT /app/web/ diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index cca7e1219..10c25f1af 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 ENV VARNISH_PORT 80 diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index 9c230cd30..7a059a937 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 ENV FTP_USER application ENV FTP_PASSWORD application diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index 68cb5449f..be9b57223 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -10,7 +10,7 @@ FROM {{ image }}:{{ tag }} MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.2.3 +LABEL io.webdevops.version=1.2.4 {%- endmacro %} {%- macro add(source, target) -%}