From d116f25377623b95b6cb37dc9485d9a496000b37 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 6 Jun 2016 18:34:00 +0200 Subject: [PATCH 1/3] Remove superfluous environment variables These environment variables are not replaced and not needed anymore Fixes #92 --- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- .../general/etc/nginx/vhost.common.d/10-php.conf | 11 ----------- 37 files changed, 407 deletions(-) diff --git a/docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } diff --git a/provisioning/nginx/general/etc/nginx/vhost.common.d/10-php.conf b/provisioning/nginx/general/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/provisioning/nginx/general/etc/nginx/vhost.common.d/10-php.conf +++ b/provisioning/nginx/general/etc/nginx/vhost.common.d/10-php.conf @@ -2,17 +2,6 @@ location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_param MYSQL_USER ""; - fastcgi_param MYSQL_PASSWORD ""; - fastcgi_param MYSQL_ROOT_USER "root"; - fastcgi_param MYSQL_ROOT_PASSWORD ""; - fastcgi_param MYSQL_DATABASE ""; - - fastcgi_param POSTGRES_USER ""; - fastcgi_param POSTGRES_PASSWORD ""; - fastcgi_read_timeout 1000; } From 73d12d62b3a8bd16a6e6892b3d07489377737c2a Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 6 Jun 2016 18:58:23 +0200 Subject: [PATCH 2/3] Add more docker layout documentation --- .../DockerImages/dockerfiles/apache.rst | 50 +---------------- .../DockerImages/dockerfiles/hhvm-apache.rst | 3 + .../DockerImages/dockerfiles/hhvm-nginx.rst | 2 + .../content/DockerImages/dockerfiles/hhvm.rst | 9 +-- .../dockerfiles/include/layout-apache.rst | 56 +++++++++++++++++++ .../dockerfiles/include/layout-hhvm.rst | 14 +++++ .../dockerfiles/include/layout-nginx.rst | 48 ++++++++++++++++ .../dockerfiles/include/layout-php.rst | 18 ++++++ .../DockerImages/dockerfiles/nginx.rst | 44 +-------------- .../dockerfiles/php-apache-dev.rst | 3 + .../DockerImages/dockerfiles/php-apache.rst | 3 + .../DockerImages/dockerfiles/php-dev.rst | 1 + .../dockerfiles/php-nginx-dev.rst | 2 + .../DockerImages/dockerfiles/php-nginx.rst | 2 + .../content/DockerImages/dockerfiles/php.rst | 10 +--- 15 files changed, 156 insertions(+), 109 deletions(-) create mode 100644 documentation/docs/content/DockerImages/dockerfiles/include/layout-apache.rst create mode 100644 documentation/docs/content/DockerImages/dockerfiles/include/layout-hhvm.rst create mode 100644 documentation/docs/content/DockerImages/dockerfiles/include/layout-nginx.rst create mode 100644 documentation/docs/content/DockerImages/dockerfiles/include/layout-php.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/apache.rst b/documentation/docs/content/DockerImages/dockerfiles/apache.rst index 01d511c7d..02fefed4b 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/apache.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/apache.rst @@ -20,54 +20,6 @@ Environment variables Docker image layout ------------------- -================================================================= ==================================================================== -File/Directory Description ------------------------------------------------------------------ -------------------------------------------------------------------- -``/opt/docker/etc/httpd/conf.d`` |badge-customization| Main global configuration directory +.. include:: include/layout-apache.rst - (automatically included files) -``/opt/docker/etc/httpd/conf.d/10-php.conf`` PHP cgi configuration -``/opt/docker/etc/httpd/conf.d/10-error-document.conf`` Error document configuration - -``/opt/docker/etc/httpd/conf.d/10-log.conf`` Log configuration - -``/opt/docker/etc/httpd/conf.d/10-server.conf`` Basic server configuration - -``/opt/docker/etc/httpd/ssl`` |badge-customization| SSL configuration directory for - - certifications and keys - - -``/opt/docker/etc/httpd/ssl/server.crt`` |badge-customization| Example SSL certification (*.vm) - -``/opt/docker/etc/httpd/ssl/server.csr`` |badge-customization| Example SSL certification request (*.vm) - -``/opt/docker/etc/httpd/ssl/server.key`` |badge-customization| Example SSL key (*.vm) - -``/opt/docker/etc/httpd/vhost.common.d`` |badge-customization| Vhost configuration directory - - (automatically included files) - -``/opt/docker/etc/httpd/vhost.common.d/01-boilerplate.conf`` Placeholder configuration file - - (prevent include errors for Apache 2.2) - -``/opt/docker/etc/httpd/global.conf`` Global httpd configuration - -``/opt/docker/etc/httpd/main.conf`` Main httpd configuration - -``/opt/docker/etc/httpd/php.conf`` |badge-deprecated| Deprecated PHP configuration - -``/opt/docker/etc/httpd/vhost.common.conf`` |badge-deprecated| Deprecated vhost common include - -``/opt/docker/etc/httpd/vhost.conf`` Vhost configuration - -``/opt/docker/etc/httpd/vhost.ssl.conf`` Vhost SSL configuration -================================================================= ==================================================================== - -.. |badge-customization| image:: https://img.shields.io/badge/hint-customization-blue.svg?style=flat - :target: badge-customization - -.. |badge-deprecated| image:: https://img.shields.io/badge/hint-deprecated-lightgrey.svg?style=flat - :target: badge-deprecated diff --git a/documentation/docs/content/DockerImages/dockerfiles/hhvm-apache.rst b/documentation/docs/content/DockerImages/dockerfiles/hhvm-apache.rst index d210fb27d..65d2f70ff 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/hhvm-apache.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/hhvm-apache.rst @@ -19,3 +19,6 @@ Environment variables Docker image layout ------------------- + +.. include:: include/layout-apache.rst +.. include:: include/layout-hhvm.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/hhvm-nginx.rst b/documentation/docs/content/DockerImages/dockerfiles/hhvm-nginx.rst index 2f7e2de6c..0d2aba8b2 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/hhvm-nginx.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/hhvm-nginx.rst @@ -20,3 +20,5 @@ Environment variables Docker image layout ------------------- +.. include:: include/layout-nginx.rst +.. include:: include/layout-hhvm.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/hhvm.rst b/documentation/docs/content/DockerImages/dockerfiles/hhvm.rst index 0e8566bc0..ce6941f69 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/hhvm.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/hhvm.rst @@ -14,11 +14,4 @@ Docker image tags Docker image layout ------------------- -==================================================== ================================================================== -File/Directory Description ----------------------------------------------------- ------------------------------------------------------------------ -``/opt/docker/etc/php/php.ini`` WebDevOps php.ini file with basic settings -``/opt/docker/etc/php/fpm/php-fpm.conf`` PHP-FPM configuration file -``/opt/docker/etc/php/fpm/pool.d/application.conf`` PHP-FPM applocation pool configuration file -``/opt/docker/etc/supervisor.d/php-fpm.conf`` Supervisord configuration file for PHP-FPM -==================================================== ================================================================== +.. include:: include/layout-hhvm.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/layout-apache.rst b/documentation/docs/content/DockerImages/dockerfiles/include/layout-apache.rst new file mode 100644 index 000000000..10b769b4a --- /dev/null +++ b/documentation/docs/content/DockerImages/dockerfiles/include/layout-apache.rst @@ -0,0 +1,56 @@ +Apache layout +^^^^^^^^^^^^^ + +================================================================= ==================================================================== +File/Directory Description +----------------------------------------------------------------- -------------------------------------------------------------------- +``/opt/docker/etc/httpd/conf.d`` |badge-customization| Main global configuration directory + + (automatically included files) +``/opt/docker/etc/httpd/conf.d/10-php.conf`` PHP cgi configuration + +``/opt/docker/etc/httpd/conf.d/10-error-document.conf`` Error document configuration + +``/opt/docker/etc/httpd/conf.d/10-log.conf`` Log configuration + +``/opt/docker/etc/httpd/conf.d/10-server.conf`` Basic server configuration + +``/opt/docker/etc/httpd/ssl`` |badge-customization| SSL configuration directory for + + certifications and keys + + +``/opt/docker/etc/httpd/ssl/server.crt`` |badge-customization| Example SSL certification (*.vm) + +``/opt/docker/etc/httpd/ssl/server.csr`` |badge-customization| Example SSL certification request (*.vm) + +``/opt/docker/etc/httpd/ssl/server.key`` |badge-customization| Example SSL key (*.vm) + +``/opt/docker/etc/httpd/vhost.common.d`` |badge-customization| Vhost configuration directory + + (automatically included files) + +``/opt/docker/etc/httpd/vhost.common.d/01-boilerplate.conf`` Placeholder configuration file + + (prevent include errors for Apache 2.2) + +``/opt/docker/etc/httpd/global.conf`` Global httpd configuration + +``/opt/docker/etc/httpd/main.conf`` Main httpd configuration + +``/opt/docker/etc/httpd/php.conf`` |badge-deprecated| Deprecated PHP configuration + +``/opt/docker/etc/httpd/vhost.common.conf`` |badge-deprecated| Deprecated vhost common include + +``/opt/docker/etc/httpd/vhost.conf`` Vhost configuration + +``/opt/docker/etc/httpd/vhost.ssl.conf`` Vhost SSL configuration + +``/opt/docker/etc/supervisor.d/httpd.conf`` Supervisord configuration file for Apache HTTPD +================================================================= ==================================================================== + +.. |badge-customization| image:: https://img.shields.io/badge/hint-customization-blue.svg?style=flat + :target: badge-customization + +.. |badge-deprecated| image:: https://img.shields.io/badge/hint-deprecated-lightgrey.svg?style=flat + :target: badge-deprecated diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/layout-hhvm.rst b/documentation/docs/content/DockerImages/dockerfiles/include/layout-hhvm.rst new file mode 100644 index 000000000..bcd4708e5 --- /dev/null +++ b/documentation/docs/content/DockerImages/dockerfiles/include/layout-hhvm.rst @@ -0,0 +1,14 @@ +HHVM layout +^^^^^^^^^^^ + +================================================================= ==================================================================== +File/Directory Description +----------------------------------------------------------------- -------------------------------------------------------------------- +``/opt/docker/etc/supervisor.d/hhvm.conf`` Supervisord configuration file for HHVM +================================================================= ==================================================================== + +.. |badge-customization| image:: https://img.shields.io/badge/hint-customization-blue.svg?style=flat + :target: badge-customization + +.. |badge-deprecated| image:: https://img.shields.io/badge/hint-deprecated-lightgrey.svg?style=flat + :target: badge-deprecated diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/layout-nginx.rst b/documentation/docs/content/DockerImages/dockerfiles/include/layout-nginx.rst new file mode 100644 index 000000000..90c65ecb0 --- /dev/null +++ b/documentation/docs/content/DockerImages/dockerfiles/include/layout-nginx.rst @@ -0,0 +1,48 @@ +Nginx layout +^^^^^^^^^^^^ + +================================================================= ==================================================================== +File/Directory Description +----------------------------------------------------------------- -------------------------------------------------------------------- +``/opt/docker/etc/nginx/conf.d`` |badge-customization| Main global configuration directory + + (automatically included files) +``/opt/docker/etc/nginx/conf.d/10-php.conf`` PHP cgi configuration + +``/opt/docker/etc/nginx/ssl`` |badge-customization| SSL configuration directory for + + certifications and keys +``/opt/docker/etc/nginx//ssl/server.crt`` |badge-customization| Example SSL certification (*.vm) + +``/opt/docker/etc/nginx/ssl/server.csr`` |badge-customization| Example SSL certification request (*.vm) + +``/opt/docker/etc/nginx/ssl/server.key`` |badge-customization| Example SSL key (*.vm) + +``/opt/docker/etc/nginx/vhost.common.d`` |badge-customization| Vhost configuration directory + + (automatically included files) + +``/opt/docker/etc/nginx/vhost.common.d/10-location-root.conf`` Redirect requests to DOCUMENT_INDEX + +``/opt/docker/etc/nginx/vhost.common.d/10-php.conf`` PHP cgi configuration for vhost + +``/opt/docker/etc/nginx/global.conf`` Global nginx configuration + +``/opt/docker/etc/nginx/main.conf`` Main Nginx configuration + +``/opt/docker/etc/nginx/php.conf`` |badge-deprecated| Deprecated PHP configuration + +``/opt/docker/etc/nginx/vhost.common.conf`` |badge-deprecated| Deprecated vhost common include + +``/opt/docker/etc/nginx/vhost.conf`` Vhost configuration + +``/opt/docker/etc/nginx/vhost.ssl.conf`` Vhost SSL configuration + +``/opt/docker/etc/supervisor.d/nginx.conf`` Supervisord configuration file for Nginx +================================================================= ==================================================================== + +.. |badge-customization| image:: https://img.shields.io/badge/hint-customization-blue.svg?style=flat + :target: badge-customization + +.. |badge-deprecated| image:: https://img.shields.io/badge/hint-deprecated-lightgrey.svg?style=flat + :target: badge-deprecated diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/layout-php.rst b/documentation/docs/content/DockerImages/dockerfiles/include/layout-php.rst new file mode 100644 index 000000000..9d7479a88 --- /dev/null +++ b/documentation/docs/content/DockerImages/dockerfiles/include/layout-php.rst @@ -0,0 +1,18 @@ +PHP layout +^^^^^^^^^^ + +================================================================= ==================================================================== +File/Directory Description +----------------------------------------------------------------- -------------------------------------------------------------------- +``/opt/docker/etc/php/php.webdevops.ini`` PHP settings from WebDevOps image +``/opt/docker/etc/php/php.ini`` |badge-customization| php.ini for custom settings +``/opt/docker/etc/php/fpm/php-fpm.conf`` PHP-FPM main configuration file +``/opt/docker/etc/php/fpm/pool.d/application.conf`` Application PHP-FPM pool configuration file +``/opt/docker/etc/supervisor.d/php-fpm.conf`` Supervisord configuration file for PHP-FPM +================================================================= ==================================================================== + +.. |badge-customization| image:: https://img.shields.io/badge/hint-customization-blue.svg?style=flat + :target: badge-customization + +.. |badge-deprecated| image:: https://img.shields.io/badge/hint-deprecated-lightgrey.svg?style=flat + :target: badge-deprecated diff --git a/documentation/docs/content/DockerImages/dockerfiles/nginx.rst b/documentation/docs/content/DockerImages/dockerfiles/nginx.rst index 42494596e..c35950262 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/nginx.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/nginx.rst @@ -20,46 +20,4 @@ Environment variables Docker image layout ------------------- -================================================================= ==================================================================== -File/Directory Description ------------------------------------------------------------------ -------------------------------------------------------------------- -``/opt/docker/etc/nginx/conf.d`` |badge-customization| Main global configuration directory - - (automatically included files) -``/opt/docker/etc/nginx/conf.d/10-php.conf`` PHP cgi configuration - -``/opt/docker/etc/nginx/ssl`` |badge-customization| SSL configuration directory for - - certifications and keys -``/opt/docker/etc/nginx//ssl/server.crt`` |badge-customization| Example SSL certification (*.vm) - -``/opt/docker/etc/nginx/ssl/server.csr`` |badge-customization| Example SSL certification request (*.vm) - -``/opt/docker/etc/nginx/ssl/server.key`` |badge-customization| Example SSL key (*.vm) - -``/opt/docker/etc/nginx/vhost.common.d`` |badge-customization| Vhost configuration directory - - (automatically included files) - -``/opt/docker/etc/nginx/vhost.common.d/10-location-root.conf`` Redirect requests to DOCUMENT_INDEX - -``/opt/docker/etc/nginx/vhost.common.d/10-php.conf`` PHP cgi configuration for vhost - -``/opt/docker/etc/nginx/global.conf`` Global nginx configuration - -``/opt/docker/etc/nginx/main.conf`` Main Nginx configuration - -``/opt/docker/etc/nginx/php.conf`` |badge-deprecated| Deprecated PHP configuration - -``/opt/docker/etc/nginx/vhost.common.conf`` |badge-deprecated| Deprecated vhost common include - -``/opt/docker/etc/nginx/vhost.conf`` Vhost configuration - -``/opt/docker/etc/nginx/vhost.ssl.conf`` Vhost SSL configuration -================================================================= ==================================================================== - -.. |badge-customization| image:: https://img.shields.io/badge/hint-customization-blue.svg?style=flat - :target: badge-customization - -.. |badge-deprecated| image:: https://img.shields.io/badge/hint-deprecated-lightgrey.svg?style=flat - :target: badge-deprecated +.. include:: include/layout-nginx.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst index de009a1bb..2d6246b08 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst @@ -21,3 +21,6 @@ Environment variables Docker image layout ------------------- + +.. include:: include/layout-apache.rst +.. include:: include/layout-php.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst b/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst index 9e9da4d45..28f40a11a 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst @@ -19,3 +19,6 @@ Environment variables Docker image layout ------------------- + +.. include:: include/layout-apache.rst +.. include:: include/layout-php.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst index c5d0ea58e..bb75f291c 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst @@ -16,3 +16,4 @@ Docker image tags Docker image layout ------------------- +.. include:: include/layout-php.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst index 4f86379fe..dc0d64085 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst @@ -22,3 +22,5 @@ Environment variables Docker image layout ------------------- +.. include:: include/layout-nginx.rst +.. include:: include/layout-php.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst b/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst index 9edc627c3..e6ad35069 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst @@ -20,3 +20,5 @@ Environment variables Docker image layout ------------------- +.. include:: include/layout-nginx.rst +.. include:: include/layout-php.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/php.rst b/documentation/docs/content/DockerImages/dockerfiles/php.rst index 962261d3f..ecdde587c 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php.rst @@ -14,12 +14,4 @@ Docker image tags Docker image layout ------------------- -==================================================== ================================================================== -File/Directory Description ----------------------------------------------------- ------------------------------------------------------------------ -``/opt/docker/etc/php/php.ini`` Placeholder php.ini file for custom configuration -``/opt/docker/etc/php/php.webdevops.ini`` WebDevOps php.ini file with basic settings -``/opt/docker/etc/php/fpm/php-fpm.conf`` PHP-FPM configuration file -``/opt/docker/etc/php/fpm/pool.d/application.conf`` PHP-FPM applocation pool configuration file -``/opt/docker/etc/supervisor.d/php-fpm.conf`` Supervisord configuration file for PHP-FPM -==================================================== ================================================================== +.. include:: include/layout-php.rst From 998862bef6d678a0d1e286216a606b885960674b Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 6 Jun 2016 23:28:50 +0200 Subject: [PATCH 3/3] Version bump --- CHANGELOG.md | 19 +++++++++++++++++++ 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/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/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/mail-sandbox/latest/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 +- .../php-apache-dev/alpine-3-php7/Dockerfile | 2 +- docker/php-apache-dev/alpine-3/Dockerfile | 2 +- docker/php-apache-dev/centos-7/Dockerfile | 2 +- docker/php-apache-dev/debian-7/Dockerfile | 2 +- .../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/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/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/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/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/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 +- 150 files changed, 168 insertions(+), 149 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb209cda5..7bb204b0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,25 @@ This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/D ## [1.0.0] - upcoming +## [0.50.4] - 2016-06-06 +### Removed +- Removed superfluous environment variables for PHP inside nginx +### Changed +- Added more layout sections to documentation + + +## [0.50.3] - 2016-06-06 +### Added +- Added `WEB_PHP_SOCKET` for apache and nginx images, this env variable specifies the host where php-fpm is listening +- Added `WEB_NO_CACHE_PATTERN` to apache and nginx images (regexp of files which should not be cached by browser) for php*-dev images +- Added `make baselayout` for building baselayout.tar (not always needed) +- Added php-fpm clear_env workaround for php-fpm versions which doesn't support it +### Changed +- Set PHP-FPM ports to public on php*-dev images +- Set mail-sandbox to latest tag (using Ubuntu 16.04) +- Moved environment macros of jinja2 templates to environment.jinja2 +- Updated documentation + ## [0.50.2] - 2016-05-27 ### Changed - Fix /opt/docker/bin/service.d/php-fpm.sh using php.d instead of php-fpm.d diff --git a/docker/ansible/alpine-3/Dockerfile b/docker/ansible/alpine-3/Dockerfile index 0e1469eb9..fede26778 100644 --- a/docker/ansible/alpine-3/Dockerfile +++ b/docker/ansible/alpine-3/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index 50c7e4081..abda9b3c1 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index 70f2f04a4..a93b27290 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index e1efa7dfe..e519eadef 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index ed4ed9f12..7747d2b62 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index 99eef22c6..57ae66842 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index bd1778b0f..dc5c42bce 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index 326ede095..b6e4e5f32 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index 03ef6de10..e7d54f7dc 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index 2f89bb75f..e7317c768 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 diff --git a/docker/apache/alpine-3/Dockerfile b/docker/apache/alpine-3/Dockerfile index 124560c1a..1f733d033 100644 --- a/docker/apache/alpine-3/Dockerfile +++ b/docker/apache/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 82381d5f6..02c5f03d1 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 4706001f1..510022ca2 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 06bec9ef6..3017c4e0a 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 ccdd7b566..8d474e554 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 afcf0ff6c..3abec4d84 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 1c55102f2..4e2b05321 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 cbc0a9c8c..9a60cd169 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 4e72c88b9..1cb14f015 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 8311605bf..97db284ee 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 9b17d5e8e..6146249ac 100644 --- a/docker/base-app/alpine-3/Dockerfile +++ b/docker/base-app/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 1bafe6b71..8c87d3828 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 1807008c9..cea7ca916 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 d7f949ba7..2d9463802 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 450041601..db3e97101 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 ea664c17b..d728611a0 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 5be91ceef..dba178006 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 9c4827301..ca6203882 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 5bc0dcc76..a3cbfc26d 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 0376de75e..b05bd0f6a 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile index 1e5dda7c9..f79c0227f 100644 --- a/docker/base/alpine-3/Dockerfile +++ b/docker/base/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index e99c470d7..79e314d18 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index f887fa997..35b8178b4 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 16a8948d0..b81cd6222 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index ed2bafcf5..3f3491fc3 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 5692afce9..ddbfc5c58 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index f77385621..a3e785383 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index b25455d78..82556caae 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index aded550f9..bfd4f6aaa 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index 33e450f9c..df61638f9 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index 86cce71a8..7d142e5b2 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM alpine:3.3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 49cb4333c..ee562d82d 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM centos:7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 20fcf84c6..d49751454 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM debian:7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 6f6e5a61a..1f7536aef 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM debian:8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 78349c52b..47995cd8d 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM debian:stretch MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 b83e036c3..a64b22fa8 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 7908a4480..684f38842 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 b7c4c389c..bb4500c4e 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 e470d23ee..e34490bc3 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 8a813bdc2..be2c57a97 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/hhvm-apache/ubuntu-14.04/Dockerfile b/docker/hhvm-apache/ubuntu-14.04/Dockerfile index 26a978b1a..c3a84c74e 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 10426789d..7d3b5dd10 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 2c4e32ebe..a34499494 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 2a4340424..f550dffdc 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 e2b28199e..1b0cd5d6a 100644 --- a/docker/hhvm/ubuntu-14.04/Dockerfile +++ b/docker/hhvm/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 06f604dc3..b62f47a54 100644 --- a/docker/hhvm/ubuntu-16.04/Dockerfile +++ b/docker/hhvm/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index ce118458f..84fab7a35 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/postfix:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 ENV MAILBOX_USERNAME "sandbox" ENV MAILBOX_PASSWORD "mail" diff --git a/docker/nginx/alpine-3/Dockerfile b/docker/nginx/alpine-3/Dockerfile index 6cb74f44b..3d413c73b 100644 --- a/docker/nginx/alpine-3/Dockerfile +++ b/docker/nginx/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 f15351f8e..103fbaed7 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 a8e02996f..5ec78d841 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 21b00ac85..98d8e9670 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 40e64e9c5..84e613027 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 7d8d60a67..56070f52a 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 dbfd6b6d1..6247b2296 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 8fda4e139..ebf2a1a9b 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 2b2f2feca..90ca5f2de 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 0567cddbb..643602634 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 ab6a91153..5b6869256 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 8c78d9ad8..6a88b6ec7 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 c36080b05..613e422ed 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 f9b2541e8..9df6e42f0 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 fc620c663..56b961a8a 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 b62e04e2b..9a40ed8bf 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 1c313429d..9d22924d5 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 7b789c12e..c9895166e 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 6fc9366df..49214ea18 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 2b70be0d2..299be4693 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 c1dca47b8..51187394c 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 e5246499a..57242c151 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 d7cd40c9d..5b384a0a7 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 243161545..8a52a093e 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 8e7296548..326ee0f84 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 04d279c5d..e3498d77c 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 76f73209d..b7fa1335d 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 a105fb820..0e2ac9aae 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 710bde0e7..87863006b 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 0357613af..14093d435 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 962520fb6..01543bee9 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 4c7e21b7c..b942a8603 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 1c2f52732..3cf7d3463 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 92928561c..8689ea8e2 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 0b56aeef6..d7ce1e242 100644 --- a/docker/php-dev/alpine-3-php7/Dockerfile +++ b/docker/php-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine-3/Dockerfile index ae315cd7d..3df499b94 100644 --- a/docker/php-dev/alpine-3/Dockerfile +++ b/docker/php-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index 2985dc4af..ac540a04d 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index 5c0f3d519..1963ff843 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index 0084c3630..4beb0a4be 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index 4e18f0a3a..c241e38db 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 9fee24ec5..96b034f04 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index b0870b416..7419e036c 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index 1c5f23682..c35afebb6 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index ade1632e2..996c40dc2 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index 5794d592f..102d6fb5d 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 908fb0090..46f8308b0 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 06756c6ef..dc1709e9b 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 18f301cef..b82870c66 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 af2ea5056..5840b07b2 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 c8291f388..4c67f2af5 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 58bbe9605..a3915da86 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 22a2d9ca9..fb83b477d 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 a162cc53f..dcf81363f 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 48837e142..04b5120d5 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 5b280600f..a420e0124 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 cb3dad673..c9dc3e84e 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 a22faa35a..cc2bec262 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 53f8b5fae..124761d2f 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 dc2bb4830..5cf7e9b06 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 7181961b8..0fe0ed48e 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 af3a31e9f..181c590b2 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 311b0120f..115949e4c 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 3c3401a63..7b4189d38 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 f03389f90..334db82c1 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 c909bbaa8..92d279dad 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 1ac88acce..0a284cc4c 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 ef6b0a6e0..5e31e995b 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 65d8c6303..73daaa05e 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 efc1f2adc..79ade6503 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 16b40bfb2..4ccc3e599 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 ca40e577a..5b8147aec 100644 --- a/docker/php/alpine-3-php7/Dockerfile +++ b/docker/php/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 9cd3c3ded..dffa71186 100644 --- a/docker/php/alpine-3/Dockerfile +++ b/docker/php/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 cf5275e2f..4e9eb56fc 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 babfd818b..b5977a8d1 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 09fe405d8..8b24e3517 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 0b3846235..498e6ed90 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 212db1ef5..e6d3eb9a5 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 c9fb549f6..1e31b886b 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 e302c49f3..523ac79e1 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 9f5e539f4..9e3b36de7 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 508826df3..e0bc50663 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 228f91435..c4b547360 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 263397732..f8a9b95fa 100644 --- a/docker/piwik/ubuntu-14.04/Dockerfile +++ b/docker/piwik/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-nginx:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.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 4180bbc3d..7dce76299 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 COPY conf/ /opt/docker/ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 6f8c3a224..b84a16e79 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -8,7 +8,7 @@ FROM zendesk/samson:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 ############################################################################### diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index 0b5f09c71..f23bfa12c 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 RUN /usr/local/bin/apk-install \ # General sphinx diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index c4ccf9b99..6eebd0d63 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 RUN /opt/docker/bin/control.sh service.enable ssh diff --git a/docker/storage/latest/Dockerfile b/docker/storage/latest/Dockerfile index bb7e65218..81e6eb60f 100644 --- a/docker/storage/latest/Dockerfile +++ b/docker/storage/latest/Dockerfile @@ -8,7 +8,7 @@ FROM busybox:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 RUN mkdir /storage/ \ && chmod 777 /storage/ diff --git a/docker/typo3/ubuntu-14.04/Dockerfile b/docker/typo3/ubuntu-14.04/Dockerfile index 794675cb6..e6cd45b60 100644 --- a/docker/typo3/ubuntu-14.04/Dockerfile +++ b/docker/typo3/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-apache:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 ENV WEB_DOCUMENT_ROOT /app/web/ diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index b5845a717..c6880ed5c 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 ENV VARNISH_PORT 80 diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index 18fdb0387..715064866 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 ENV FTP_USER application ENV FTP_PASSWORD application diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index cf062e0e6..26dc553ce 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=7 -LABEL io.webdevops.version=0.50.3 +LABEL io.webdevops.version=0.50.4 {%- endmacro %} {%- macro add(source, target) -%}