From 385724b169d14943efbc1f7013ea0478ea8199ad Mon Sep 17 00:00:00 2001 From: Guillaume Camus Date: Thu, 16 Jun 2016 22:41:41 +0200 Subject: [PATCH 01/15] Pr/centos 7 php56 (#81) * :tada: :sparkles: Create container PHP-56 for Centos-7 * :art: Update php:centos-7-php56 with new layout * :sparkles: Add container webdevops/php-dev:centos-7-php56 * :sparkles: Add container webdevops/php-apache:centos-7-php56 * :sparkles: Add container webdevops/php-apache-dev:centos-7-php56 * :sparkles: Add container webdevops/php-nginx:centos-7-php56 * :sparkles: Add container webdevops/php-nginx-dev:centos-7-php56 --- .../php-apache-dev/centos-7-php56/Dockerfile | 31 +++++ .../centos-7-php56/Dockerfile.jinja2 | 11 ++ .../conf/bin/service.d/httpd.sh | 19 +++ .../conf/etc/httpd/conf.d/.gitkeep | 0 .../conf/etc/httpd/conf.d/02-dev.conf | 6 + .../etc/httpd/conf.d/10-error-document.conf | 15 +++ .../conf/etc/httpd/conf.d/10-log.conf | 3 + .../conf/etc/httpd/conf.d/10-php.conf | 7 ++ .../conf/etc/httpd/conf.d/10-server.conf | 18 +++ .../centos-7-php56/conf/etc/httpd/global.conf | 1 + .../centos-7-php56/conf/etc/httpd/main.conf | 10 ++ .../centos-7-php56/conf/etc/httpd/php.conf | 1 + .../conf/etc/httpd/ssl/server.crt | 28 +++++ .../conf/etc/httpd/ssl/server.csr | 26 ++++ .../conf/etc/httpd/ssl/server.key | 51 ++++++++ .../conf/etc/httpd/vhost.common.conf | 7 ++ .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 + .../conf/etc/httpd/vhost.common.d/02-dev.conf | 7 ++ .../centos-7-php56/conf/etc/httpd/vhost.conf | 36 ++++++ .../conf/etc/httpd/vhost.ssl.conf | 27 ++++ .../conf/etc/nginx/conf.d/02-dev.conf | 1 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../vhost.common.d/10-location-root.conf | 5 + .../conf/etc/supervisor.d/apache.conf | 14 +++ .../roles/webdevops-apache/defaults/main.yml | 3 + .../webdevops-apache/tasks/bootstrap.yml | 115 ++++++++++++++++++ .../roles/webdevops-apache/tasks/main.yml | 5 + .../webdevops-php-apache/defaults/main.yml | 1 + .../webdevops-php-apache/tasks/bootstrap.yml | 8 ++ .../webdevops-php-apache/tasks/entrypoint.yml | 1 + .../roles/webdevops-php-apache/tasks/main.yml | 9 ++ .../roles/webdevops-php-dev/defaults/main.yml | 6 + .../webdevops-php-dev/tasks/bootstrap.yml | 6 + .../tasks/bootstrap/php-fpm.yml | 9 ++ .../tasks/bootstrap/php-module.opcache.yml | 14 +++ .../tasks/bootstrap/php-module.xdebug.yml | 25 ++++ .../tasks/bootstrap/tools.yml | 23 ++++ .../roles/webdevops-php-dev/tasks/main.yml | 5 + .../webdevops-php-nginx-dev/defaults/main.yml | 6 + .../tasks/bootstrap.yml | 3 + .../tasks/bootstrap/nginx.yml | 9 ++ .../webdevops-php-nginx-dev/tasks/main.yml | 5 + docker/php-apache/centos-7-php56/Dockerfile | 31 +++++ .../centos-7-php56/Dockerfile.jinja2 | 11 ++ .../conf/bin/service.d/httpd.sh | 19 +++ .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 +++ .../conf/etc/httpd/conf.d/10-log.conf | 3 + .../conf/etc/httpd/conf.d/10-php.conf | 7 ++ .../conf/etc/httpd/conf.d/10-server.conf | 18 +++ .../centos-7-php56/conf/etc/httpd/global.conf | 1 + .../centos-7-php56/conf/etc/httpd/main.conf | 10 ++ .../centos-7-php56/conf/etc/httpd/php.conf | 1 + .../conf/etc/httpd/ssl/server.crt | 28 +++++ .../conf/etc/httpd/ssl/server.csr | 26 ++++ .../conf/etc/httpd/ssl/server.key | 51 ++++++++ .../conf/etc/httpd/vhost.common.conf | 7 ++ .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 + .../centos-7-php56/conf/etc/httpd/vhost.conf | 36 ++++++ .../conf/etc/httpd/vhost.ssl.conf | 27 ++++ .../conf/etc/supervisor.d/apache.conf | 14 +++ .../roles/webdevops-apache/defaults/main.yml | 3 + .../webdevops-apache/tasks/bootstrap.yml | 115 ++++++++++++++++++ .../roles/webdevops-apache/tasks/main.yml | 5 + .../webdevops-php-apache/defaults/main.yml | 1 + .../webdevops-php-apache/tasks/bootstrap.yml | 8 ++ .../webdevops-php-apache/tasks/entrypoint.yml | 1 + .../roles/webdevops-php-apache/tasks/main.yml | 9 ++ docker/php-dev/centos-7-php56/Dockerfile | 21 ++++ .../php-dev/centos-7-php56/Dockerfile.jinja2 | 7 ++ .../conf/etc/httpd/conf.d/02-dev.conf | 6 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 7 ++ .../conf/etc/nginx/conf.d/02-dev.conf | 1 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../vhost.common.d/10-location-root.conf | 5 + .../roles/webdevops-php-dev/defaults/main.yml | 6 + .../webdevops-php-dev/tasks/bootstrap.yml | 6 + .../tasks/bootstrap/php-fpm.yml | 9 ++ .../tasks/bootstrap/php-module.opcache.yml | 14 +++ .../tasks/bootstrap/php-module.xdebug.yml | 25 ++++ .../tasks/bootstrap/tools.yml | 23 ++++ .../roles/webdevops-php-dev/tasks/main.yml | 5 + .../webdevops-php-nginx-dev/defaults/main.yml | 6 + .../tasks/bootstrap.yml | 3 + .../tasks/bootstrap/nginx.yml | 9 ++ .../webdevops-php-nginx-dev/tasks/main.yml | 5 + .../php-nginx-dev/centos-7-php56/Dockerfile | 26 ++++ .../centos-7-php56/Dockerfile.jinja2 | 11 ++ .../conf/bin/service.d/nginx.sh | 16 +++ .../conf/etc/httpd/conf.d/02-dev.conf | 6 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 7 ++ .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/02-dev.conf | 1 + .../conf/etc/nginx/conf.d/10-php.conf | 3 + .../centos-7-php56/conf/etc/nginx/global.conf | 1 + .../centos-7-php56/conf/etc/nginx/main.conf | 4 + .../centos-7-php56/conf/etc/nginx/nginx.conf | 35 ++++++ .../centos-7-php56/conf/etc/nginx/php.conf | 1 + .../conf/etc/nginx/ssl/server.crt | 28 +++++ .../conf/etc/nginx/ssl/server.csr | 26 ++++ .../conf/etc/nginx/ssl/server.key | 51 ++++++++ .../conf/etc/nginx/vhost.common.conf | 2 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../vhost.common.d/10-location-root.conf | 5 + .../conf/etc/nginx/vhost.common.d/10-php.conf | 18 +++ .../centos-7-php56/conf/etc/nginx/vhost.conf | 38 ++++++ .../conf/etc/nginx/vhost.ssl.conf | 7 ++ .../conf/etc/supervisor.d/nginx.conf | 14 +++ .../roles/webdevops-nginx/defaults/main.yml | 3 + .../roles/webdevops-nginx/tasks/bootstrap.yml | 48 ++++++++ .../roles/webdevops-nginx/tasks/main.yml | 5 + .../roles/webdevops-php-dev/defaults/main.yml | 6 + .../webdevops-php-dev/tasks/bootstrap.yml | 6 + .../tasks/bootstrap/php-fpm.yml | 9 ++ .../tasks/bootstrap/php-module.opcache.yml | 14 +++ .../tasks/bootstrap/php-module.xdebug.yml | 25 ++++ .../tasks/bootstrap/tools.yml | 23 ++++ .../roles/webdevops-php-dev/tasks/main.yml | 5 + .../webdevops-php-nginx-dev/defaults/main.yml | 6 + .../tasks/bootstrap.yml | 3 + .../tasks/bootstrap/nginx.yml | 9 ++ .../webdevops-php-nginx-dev/tasks/main.yml | 5 + .../webdevops-php-nginx/defaults/main.yml | 1 + .../webdevops-php-nginx/tasks/bootstrap.yml | 9 ++ .../webdevops-php-nginx/tasks/entrypoint.yml | 1 + .../roles/webdevops-php-nginx/tasks/main.yml | 9 ++ docker/php-nginx/centos-7-php56/Dockerfile | 26 ++++ .../centos-7-php56/Dockerfile.jinja2 | 11 ++ .../conf/bin/service.d/nginx.sh | 16 +++ .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 + .../centos-7-php56/conf/etc/nginx/global.conf | 1 + .../centos-7-php56/conf/etc/nginx/main.conf | 4 + .../centos-7-php56/conf/etc/nginx/nginx.conf | 35 ++++++ .../centos-7-php56/conf/etc/nginx/php.conf | 1 + .../conf/etc/nginx/ssl/server.crt | 28 +++++ .../conf/etc/nginx/ssl/server.csr | 26 ++++ .../conf/etc/nginx/ssl/server.key | 51 ++++++++ .../conf/etc/nginx/vhost.common.conf | 2 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../vhost.common.d/10-location-root.conf | 3 + .../conf/etc/nginx/vhost.common.d/10-php.conf | 18 +++ .../centos-7-php56/conf/etc/nginx/vhost.conf | 38 ++++++ .../conf/etc/nginx/vhost.ssl.conf | 7 ++ .../conf/etc/supervisor.d/nginx.conf | 14 +++ .../roles/webdevops-nginx/defaults/main.yml | 3 + .../roles/webdevops-nginx/tasks/bootstrap.yml | 48 ++++++++ .../roles/webdevops-nginx/tasks/main.yml | 5 + .../webdevops-php-nginx/defaults/main.yml | 1 + .../webdevops-php-nginx/tasks/bootstrap.yml | 9 ++ .../webdevops-php-nginx/tasks/entrypoint.yml | 1 + .../roles/webdevops-php-nginx/tasks/main.yml | 9 ++ docker/php/centos-7-php56/Dockerfile | 58 +++++++++ docker/php/centos-7-php56/Dockerfile.jinja2 | 11 ++ .../conf/etc/logrotate.d/php5-fpm | 12 ++ .../conf/etc/php/conf.d/.gitkeep | 0 .../php/centos-7-php56/conf/etc/php/php.ini | 1 + .../conf/etc/php/php.webdevops.ini | 36 ++++++ .../conf/etc/supervisor.d/php-fpm.conf | 54 ++++++++ .../roles/webdevops-php/defaults/main.yml | 6 + .../roles/webdevops-php/tasks/bootstrap.yml | 6 + .../tasks/bootstrap/php-fpm.main.yml | 48 ++++++++ .../tasks/bootstrap/php-fpm.pool.yml | 90 ++++++++++++++ .../webdevops-php/tasks/bootstrap/php-fpm.yml | 45 +++++++ .../webdevops-php/tasks/bootstrap/php.yml | 62 ++++++++++ .../roles/webdevops-php/tasks/main.yml | 5 + template/Dockerfile/images/php5-dev.jinja2 | 8 ++ template/Dockerfile/images/php5.jinja2 | 38 ++++++ test/run.sh | 6 + 173 files changed, 2517 insertions(+) create mode 100644 docker/php-apache-dev/centos-7-php56/Dockerfile create mode 100644 docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 create mode 100644 docker/php-apache-dev/centos-7-php56/conf/bin/service.d/httpd.sh create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/.gitkeep create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/10-error-document.conf create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/10-log.conf create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/10-php.conf create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/10-server.conf create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/global.conf create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/main.conf create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/php.conf create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/ssl/server.crt create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/ssl/server.csr create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/ssl/server.key create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.conf create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/01-boilerplate.conf create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.conf create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.ssl.conf create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/supervisor.d/apache.conf create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache/defaults/main.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/main.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache/defaults/main.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/main.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/defaults/main.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/main.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml create mode 100644 docker/php-apache/centos-7-php56/Dockerfile create mode 100644 docker/php-apache/centos-7-php56/Dockerfile.jinja2 create mode 100644 docker/php-apache/centos-7-php56/conf/bin/service.d/httpd.sh create mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/.gitkeep create mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-error-document.conf create mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-log.conf create mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-php.conf create mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-server.conf create mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/global.conf create mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/main.conf create mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/php.conf create mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.crt create mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.csr create mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.key create mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.conf create mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.d/01-boilerplate.conf create mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.conf create mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.ssl.conf create mode 100644 docker/php-apache/centos-7-php56/conf/etc/supervisor.d/apache.conf create mode 100644 docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-apache/defaults/main.yml create mode 100644 docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml create mode 100644 docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/main.yml create mode 100644 docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-php-apache/defaults/main.yml create mode 100644 docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml create mode 100644 docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml create mode 100644 docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/main.yml create mode 100644 docker/php-dev/centos-7-php56/Dockerfile create mode 100644 docker/php-dev/centos-7-php56/Dockerfile.jinja2 create mode 100644 docker/php-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf create mode 100644 docker/php-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf create mode 100644 docker/php-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf create mode 100644 docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/defaults/main.yml create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/main.yml create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/Dockerfile create mode 100644 docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/nginx.sh create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/conf.d/.gitkeep create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/conf.d/10-php.conf create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/global.conf create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/main.conf create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/nginx.conf create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/php.conf create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/ssl/server.crt create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/ssl/server.csr create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/ssl/server.key create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.conf create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-php.conf create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.conf create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.ssl.conf create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/supervisor.d/nginx.conf create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx/defaults/main.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/main.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/defaults/main.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/main.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx/defaults/main.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/main.yml create mode 100644 docker/php-nginx/centos-7-php56/Dockerfile create mode 100644 docker/php-nginx/centos-7-php56/Dockerfile.jinja2 create mode 100644 docker/php-nginx/centos-7-php56/conf/bin/service.d/nginx.sh create mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/conf.d/.gitkeep create mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/conf.d/10-php.conf create mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/global.conf create mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/main.conf create mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/nginx.conf create mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/php.conf create mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.crt create mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.csr create mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.key create mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.conf create mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-php.conf create mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.conf create mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.ssl.conf create mode 100644 docker/php-nginx/centos-7-php56/conf/etc/supervisor.d/nginx.conf create mode 100644 docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-nginx/defaults/main.yml create mode 100644 docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml create mode 100644 docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/main.yml create mode 100644 docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-php-nginx/defaults/main.yml create mode 100644 docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml create mode 100644 docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml create mode 100644 docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/main.yml create mode 100644 docker/php/centos-7-php56/Dockerfile create mode 100644 docker/php/centos-7-php56/Dockerfile.jinja2 create mode 100644 docker/php/centos-7-php56/conf/etc/logrotate.d/php5-fpm create mode 100644 docker/php/centos-7-php56/conf/etc/php/conf.d/.gitkeep create mode 100644 docker/php/centos-7-php56/conf/etc/php/php.ini create mode 100644 docker/php/centos-7-php56/conf/etc/php/php.webdevops.ini create mode 100644 docker/php/centos-7-php56/conf/etc/supervisor.d/php-fpm.conf create mode 100644 docker/php/centos-7-php56/conf/provision/roles/webdevops-php/defaults/main.yml create mode 100644 docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap.yml create mode 100644 docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml create mode 100644 docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml create mode 100644 docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml create mode 100644 docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/main.yml diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile new file mode 100644 index 000000000..cab49f090 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -0,0 +1,31 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache-dev:centos-7-php56 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-dev:centos-7-php56 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=6 +LABEL io.webdevops.version=0.23.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN /usr/local/bin/yum-install \ + httpd \ + mod_ssl \ + && sed -ri ' \ + s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ + s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ + ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 new file mode 100644 index 000000000..2378eac37 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("php-dev", "centos-7-php56") }} + +{{ docker.version() }} + +{{ docker.environmentWeb() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ apache.centos('php-apache') }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/httpd.sh b/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/httpd.sh new file mode 100644 index 000000000..f9d81f74a --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/httpd.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash +set -e + +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Apache gets grumpy about PID files pre-existing +rm -f /var/run/httpd/httpd.pid + +# Replace markers +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +exec httpd -DFOREGROUND diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf new file mode 100644 index 000000000..98ffb37d4 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf @@ -0,0 +1,6 @@ +# EnableSendfile: Control whether the sendfile kernel support is +# used to deliver files (assuming that the OS supports it). +# The default is on; turn this off if you serve from NFS-mounted +# filesystems. Please see +# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile +EnableSendfile off diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/10-error-document.conf new file mode 100644 index 000000000..ebabf87e4 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/10-error-document.conf @@ -0,0 +1,15 @@ +####################################### +# Faster error documents +####################################### + + ErrorDocument 400 "400 Bad Request" + ErrorDocument 401 "401 Unauthorized" + ErrorDocument 403 "403 Forbidden" + ErrorDocument 404 "404 Not Found" + ErrorDocument 405 "405 Method Not Allowed" + + ErrorDocument 500 "500 Internal Server Error" + ErrorDocument 501 "501 Not Implemented" + ErrorDocument 502 "502 Bad Gateway" + ErrorDocument 503 "503 Service Unavailable" + diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/10-log.conf new file mode 100644 index 000000000..e1409bc34 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/10-log.conf @@ -0,0 +1,3 @@ +LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog +CustomLog /proc/self/fd/1 dockerlog +ErrorLog /proc/self/fd/2 diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/10-php.conf new file mode 100644 index 000000000..b017879ad --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/10-php.conf @@ -0,0 +1,7 @@ + + ProxySet connectiontimeout=5 timeout=600 + + + + SetHandler "proxy:fcgi://127.0.0.1:9000" + diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/10-server.conf new file mode 100644 index 000000000..d3a5defbd --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/10-server.conf @@ -0,0 +1,18 @@ +# Settings +TimeOut 1000 +ServerName "" + +DirectoryIndex +DocumentRoot "" + +"> + Options Indexes FollowSymLinks + AllowOverride All + + + Allow from all + + = 2.4> + Require all granted + + diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/global.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/main.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/main.conf new file mode 100644 index 000000000..fb04614ca --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/main.conf @@ -0,0 +1,10 @@ +Include /opt/docker/etc/httpd/global.conf +Include /opt/docker/etc/httpd/php.conf + + + Include /opt/docker/etc/httpd/conf.d/*.conf + += 2.4> + IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf + +Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/php.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/ssl/server.crt b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/ssl/server.csr b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/ssl/server.key b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.conf new file mode 100644 index 000000000..384696b4e --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.conf @@ -0,0 +1,7 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/01-boilerplate.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/01-boilerplate.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..8181e24d8 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -0,0 +1,7 @@ +FileETag None + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.conf new file mode 100644 index 000000000..c04a94318 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.conf @@ -0,0 +1,36 @@ +####################################### +# Vhost +####################################### + + + ServerName docker.vm + ServerAlias + DocumentRoot "" + + UseCanonicalName Off + + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + + + + + + ServerName docker.vm + ServerAlias + DocumentRoot "" + + UseCanonicalName Off + + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + + + Include /opt/docker/etc/httpd/vhost.ssl.conf + diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.ssl.conf new file mode 100644 index 000000000..1261fd747 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.ssl.conf @@ -0,0 +1,27 @@ + ############ + # SSL + ############ + + SSLEngine on + SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt + SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key + + + SSLOptions +StdEnvVars + + + SSLOptions +StdEnvVars + + + BrowserMatch "MSIE [2-6]" \ + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 + # MSIE 7 and newer should be able to use keepalive + # This regexp is ok with 17-9! + BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown + + ## SSL Hardening + SSLProtocol All -SSLv2 -SSLv3 + SSLHonorCipherOrder on + SSLCompression off + SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf new file mode 100644 index 000000000..4a6eaa050 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -0,0 +1,5 @@ +location / { + try_files $uri $uri/ /?$query_string; + expires 0; + add_header Cache-Control private; +} diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/supervisor.d/apache.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/supervisor.d/apache.conf new file mode 100644 index 000000000..12a6f86f7 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/supervisor.d/apache.conf @@ -0,0 +1,14 @@ +[group:apache] +programs=apached +priority=20 + +[program:apached] +command = /opt/docker/bin/service.d/httpd.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache/defaults/main.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache/defaults/main.yml new file mode 100644 index 000000000..69cba1cb4 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache/defaults/main.yml @@ -0,0 +1,3 @@ +--- + +DOCUMENT_ROOT: "{{ lookup('env','WEB_DOCUMENT_ROOT') }}" diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml new file mode 100644 index 000000000..bf82e5d64 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -0,0 +1,115 @@ +--- + +- name: Set apache vhost file [RedHat family] + set_fact: + apache_docker_vhost: /etc/httpd/conf.d/docker.conf + when: ansible_os_family == 'RedHat' + +- name: Set apache vhost file [Debian family] + set_fact: + apache_docker_vhost: /etc/apache2/sites-enabled/10-docker.conf + when: ansible_os_family == 'Debian' + +- name: Set apache vhost file [Alpine family] + set_fact: + apache_docker_vhost: /etc/apache2/conf.d/docker.conf + when: ansible_os_family == 'Alpine' + +- name: Enable apache main config + file: + src: '/opt/docker/etc/httpd/main.conf' + dest: '{{ apache_docker_vhost }}' + state: link + force: yes + +- name: Ensure document root is available + file: + path: "{{ DOCUMENT_ROOT }}" + state: directory + recurse: yes + +- name: Ensure /var/run/apache2 exists + file: + path: '/var/run/apache2' + state: directory + recurse: yes + +- name: Ensure /run/apache2 exists + file: + path: '/run/apache2' + state: directory + recurse: yes + when: ansible_os_family == 'Alpine' + +- name: Switch MPM to worker [RedHat family] + lineinfile: + dest: '/etc/httpd/conf.modules.d/00-mpm.conf' + regexp: '^[\s#]*{{ item.line }}' + line: '{{ item.prefix }}{{ item.line }}' + with_items: + - { line: 'LoadModule mpm_prefork_module modules/mod_mpm_prefork.so', prefix: "#" } + - { line: 'LoadModule mpm_event_module modules/mod_mpm_event.so', prefix: "" } + when: ansible_os_family == 'RedHat' + +- name: Switch MPM to event for Apache 2.4 and higher [Ubuntu family] + command: "{{ item }}" + with_items: + - 'a2dismod mpm_event' + - 'a2enmod mpm_event' + when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + +- name: Manage modules [Alpine family] + lineinfile: + dest: '/etc/apache2/httpd.conf' + regexp: '^[\s#]*{{ item.line }}' + line: '{{ item.prefix }}{{ item.line }}' + with_items: + - { line: 'LoadModule mpm_prefork_module modules/mod_mpm_prefork.so', prefix: "#" } + - { line: 'LoadModule mpm_event_module modules/mod_mpm_event.so', prefix: "" } + - { line: 'LoadModule deflate_module modules/mod_deflate.so', prefix: "" } + - { line: 'LoadModule rewrite_module modules/mod_rewrite.so', prefix: "" } + - { line: 'LoadModule logio_module modules/mod_logio.so', prefix: "" } + - { line: 'LoadModule slotmem_shm_module modules/mod_slotmem_shm.so', prefix: "" } + - { line: 'LoadModule actions_module modules/mod_actions.so', prefix: "" } + - { line: 'LoadModule expires_module modules/mod_expires.so', prefix: "" } + when: ansible_os_family == 'Alpine' + +- name: Fix ssl support [Alpine family] + lineinfile: + dest: '/etc/apache2/conf.d/ssl.conf' + regexp: '{{ item.regexp }}' + line: '{{ item.line }}' + with_items: + - { regexp: 'LoadModule ssl_module', line: 'LoadModule ssl_module /usr/lib/apache2/mod_ssl.so' } + - { regexp: 'LoadModule socache_shmcb_module', line: 'LoadModule socache_shmcb_module /usr/lib/apache2/mod_socache_shmcb.so' } + when: ansible_os_family == 'Alpine' + +- name: Disable proxy [Alpine family] + lineinfile: + dest: '/etc/apache2/conf.d/proxy.conf' + regexp: '^[\s#]*{{ item.line }}' + line: '{{ item.prefix }}{{ item.line }}' + with_items: + - { line: 'LoadModule proxy_ajp_module modules/mod_proxy_ajp.so', prefix: "#" } + - { line: 'LoadModule proxy_connect_module modules/mod_proxy_connect.so', prefix: "#" } + - { line: 'LoadModule proxy_balancer_module modules/mod_proxy_balancer.so', prefix: "#" } + - { line: 'LoadModule proxy_express_module modules/mod_proxy_express.so', prefix: "#" } + - { line: 'LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so', prefix: "" } + - { line: 'LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so', prefix: "#" } + - { line: 'LoadModule proxy_ftp_module modules/mod_proxy_ftp.so', prefix: "#" } + - { line: 'LoadModule proxy_http_module modules/mod_proxy_http.so', prefix: "#" } + - { line: 'LoadModule proxy_scgi_module modules/mod_proxy_scgi.so', prefix: "#" } + when: ansible_os_family == 'Alpine' + +- name: Fix rights of ssl files + file: + path: "{{ item.path }}" + state: "{{ item.state }}" + mode: "{{ item.mode }}" + owner: "root" + group: "root" + with_items: + - { path: '/opt/docker/etc/httpd/ssl', state: 'directory', mode: '0750' } + - { path: '/opt/docker/etc/httpd/ssl/server.crt', state: 'file', mode: '0640' } + - { path: '/opt/docker/etc/httpd/ssl/server.csr', state: 'file', mode: '0640' } + - { path: '/opt/docker/etc/httpd/ssl/server.key', state: 'file', mode: '0640' } diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/main.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache/defaults/main.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache/defaults/main.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache/defaults/main.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml new file mode 100644 index 000000000..ad5fb2121 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml @@ -0,0 +1,8 @@ +--- +- name: Restrict php-fpm to local connection + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "127.0.0.1:9000" } diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/main.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/main.yml new file mode 100644 index 000000000..7895a52a9 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/main.yml @@ -0,0 +1,9 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap + +- include: entrypoint.yml + tags: + - entrypoint diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..7293c52a3 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -0,0 +1,6 @@ +--- + +- include: bootstrap/tools.yml +- include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..c9e0154b7 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Configure php-fpm pool user (www.conf) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml new file mode 100644 index 000000000..9c243a671 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml @@ -0,0 +1,14 @@ +--- + +- name: Setup php.ini for development environment + lineinfile: + dest: '/opt/docker/etc/php/php.webdevops.ini' + regexp: '^[\s;]*{{ item.variable }}[\s]*=' + line: '{{ item.variable }} = {{ item.value }}' + with_items: + - { variable: 'opcache.memory_consumption', value: '256' } + - { variable: 'opcache.validate_timestamps', value: '1' } + - { variable: 'opcache.revalidate_freq', value: '0' } + - { variable: 'opcache.interned_strings_buffer', value: '16' } + - { variable: 'opcache.max_accelerated_files', value: '7963' } + - { variable: 'opcache.fast_shutdown', value: '1' } diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml new file mode 100644 index 000000000..885cb22a2 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml @@ -0,0 +1,25 @@ +--- + +# Ignored on php7 +- name: Fix php xdebug module [Alpine family] + lineinfile: + dest: '/etc/php/conf.d/xdebug.ini' + regexp: 'extension=xdebug.so' + line: 'zend_extension=xdebug.so' + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Setup php.ini for development environment + lineinfile: + dest: '/opt/docker/etc/php/php.webdevops.ini' + regexp: '^[\s;]*{{ item.variable }}[\s]*=' + line: '{{ item.variable }} = {{ item.value }}' + with_items: + - { variable: 'xdebug.remote_enable', value: '1' } + - { variable: 'xdebug.remote_connect_back', value: '1' } + - { variable: 'xdebug.idekey', value: 'docker' } + - { variable: 'xdebug.cli_color', value: '1' } + - { variable: 'xdebug.max_nesting_level', value: '1000' } + - { variable: 'xdebug.profiler_enable_trigger', value: '1000' } + - { variable: 'xdebug.profiler_output_dir', value: '/tmp/debug/' } + - { variable: 'xhprof.output_dir', value: '/tmp/debug/' } diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml new file mode 100644 index 000000000..c49cb0e34 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml @@ -0,0 +1,23 @@ +--- + +- name: Downloading Tools + shell: curl -o "{{ item.dest }}" "{{ item.url }}" && chmod 755 "{{ item.dest }}" + with_items: + - { url: "https://phar.phpunit.de/phploc.phar", dest: /usr/local/bin/phploc } + - { url: "https://phar.phpunit.de/phpunit.phar", dest: /usr/local/bin/phpunit } + - { url: "http://static.pdepend.org/php/latest/pdepend.phar", dest: /usr/local/bin/pdepend } + - { url: "http://static.phpmd.org/php/latest/phpmd.phar", dest: /usr/local/bin/phpmd } + - { url: "https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar", dest: /usr/local/bin/phpcs } + - { url: "https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar", dest: /usr/local/bin/phpcbf } + - { url: "https://phar.phpunit.de/phpcpd.phar", dest: /usr/local/bin/phpcpd } + - { url: "https://phar.phpunit.de/phpdcd.phar", dest: /usr/local/bin/phpdcd } + - { url: "https://github.com/Halleck45/PhpMetrics/raw/master/build/phpmetrics.phar", dest: /usr/local/bin/phpmetrics } + - { url: "http://get.sensiolabs.org/php-cs-fixer.phar", dest: /usr/local/bin/php-cs-fixer } + - { url: "https://github.com/sensiolabs-de/deprecation-detector/releases/download/0.1.0-alpha4/deprecation-detector.phar", dest: /usr/local/bin/deprecation-detector } + - { url: "https://github.com/sensiolabs-de/deprecation-detector/releases/download/0.1.0-alpha4/deprecation-detector.phar", dest: /usr/local/bin/deprecation-detector } + +- name: Install Tools via composer + raw: COMPOSER_HOME="/usr/local/composer" COMPOSER_BIN_DIR="/usr/local/bin" composer global require "{{ item.package }}" "{{ item.version }}" + with_items: + - { package: "sstalle/php7cc" , version: "*" } + - { package: "phpspec/phpspec" , version: "~2.0" } diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/main.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml new file mode 100644 index 000000000..8075b2d9d --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml @@ -0,0 +1,9 @@ +--- + +- name: Disable sendfile for nginx + lineinfile: + dest: /etc/nginx/nginx.conf + regexp: '[\s;]*{{ item.key }}[\s]*' + line: '{{ item.key }} {{ item.value }};' + with_items: + - { key: 'sendfile', value: "off" } diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile new file mode 100644 index 000000000..78176176a --- /dev/null +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -0,0 +1,31 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache:centos-7-php56 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:centos-7-php56 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=6 +LABEL io.webdevops.version=0.23.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install apache +RUN /usr/local/bin/yum-install \ + httpd \ + mod_ssl \ + && sed -ri ' \ + s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ + s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ + ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/php-apache/centos-7-php56/Dockerfile.jinja2 b/docker/php-apache/centos-7-php56/Dockerfile.jinja2 new file mode 100644 index 000000000..d9ed20444 --- /dev/null +++ b/docker/php-apache/centos-7-php56/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("php", "centos-7-php56") }} + +{{ docker.version() }} + +{{ docker.environmentWeb() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ apache.centos('php-apache') }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache/centos-7-php56/conf/bin/service.d/httpd.sh b/docker/php-apache/centos-7-php56/conf/bin/service.d/httpd.sh new file mode 100644 index 000000000..f9d81f74a --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/bin/service.d/httpd.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash +set -e + +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Apache gets grumpy about PID files pre-existing +rm -f /var/run/httpd/httpd.pid + +# Replace markers +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +exec httpd -DFOREGROUND diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-error-document.conf new file mode 100644 index 000000000..ebabf87e4 --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-error-document.conf @@ -0,0 +1,15 @@ +####################################### +# Faster error documents +####################################### + + ErrorDocument 400 "400 Bad Request" + ErrorDocument 401 "401 Unauthorized" + ErrorDocument 403 "403 Forbidden" + ErrorDocument 404 "404 Not Found" + ErrorDocument 405 "405 Method Not Allowed" + + ErrorDocument 500 "500 Internal Server Error" + ErrorDocument 501 "501 Not Implemented" + ErrorDocument 502 "502 Bad Gateway" + ErrorDocument 503 "503 Service Unavailable" + diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-log.conf new file mode 100644 index 000000000..e1409bc34 --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-log.conf @@ -0,0 +1,3 @@ +LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog +CustomLog /proc/self/fd/1 dockerlog +ErrorLog /proc/self/fd/2 diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-php.conf new file mode 100644 index 000000000..b017879ad --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-php.conf @@ -0,0 +1,7 @@ + + ProxySet connectiontimeout=5 timeout=600 + + + + SetHandler "proxy:fcgi://127.0.0.1:9000" + diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-server.conf new file mode 100644 index 000000000..d3a5defbd --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-server.conf @@ -0,0 +1,18 @@ +# Settings +TimeOut 1000 +ServerName "" + +DirectoryIndex +DocumentRoot "" + +"> + Options Indexes FollowSymLinks + AllowOverride All + + + Allow from all + + = 2.4> + Require all granted + + diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/global.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/etc/httpd/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/main.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/main.conf new file mode 100644 index 000000000..fb04614ca --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/etc/httpd/main.conf @@ -0,0 +1,10 @@ +Include /opt/docker/etc/httpd/global.conf +Include /opt/docker/etc/httpd/php.conf + + + Include /opt/docker/etc/httpd/conf.d/*.conf + += 2.4> + IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf + +Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/php.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/etc/httpd/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.crt b/docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.csr b/docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.key b/docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.conf new file mode 100644 index 000000000..384696b4e --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.conf @@ -0,0 +1,7 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.d/01-boilerplate.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.d/01-boilerplate.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.conf new file mode 100644 index 000000000..c04a94318 --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.conf @@ -0,0 +1,36 @@ +####################################### +# Vhost +####################################### + + + ServerName docker.vm + ServerAlias + DocumentRoot "" + + UseCanonicalName Off + + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + + + + + + ServerName docker.vm + ServerAlias + DocumentRoot "" + + UseCanonicalName Off + + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + + + Include /opt/docker/etc/httpd/vhost.ssl.conf + diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.ssl.conf new file mode 100644 index 000000000..1261fd747 --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.ssl.conf @@ -0,0 +1,27 @@ + ############ + # SSL + ############ + + SSLEngine on + SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt + SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key + + + SSLOptions +StdEnvVars + + + SSLOptions +StdEnvVars + + + BrowserMatch "MSIE [2-6]" \ + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 + # MSIE 7 and newer should be able to use keepalive + # This regexp is ok with 17-9! + BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown + + ## SSL Hardening + SSLProtocol All -SSLv2 -SSLv3 + SSLHonorCipherOrder on + SSLCompression off + SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/centos-7-php56/conf/etc/supervisor.d/apache.conf b/docker/php-apache/centos-7-php56/conf/etc/supervisor.d/apache.conf new file mode 100644 index 000000000..12a6f86f7 --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/etc/supervisor.d/apache.conf @@ -0,0 +1,14 @@ +[group:apache] +programs=apached +priority=20 + +[program:apached] +command = /opt/docker/bin/service.d/httpd.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-apache/defaults/main.yml b/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-apache/defaults/main.yml new file mode 100644 index 000000000..69cba1cb4 --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-apache/defaults/main.yml @@ -0,0 +1,3 @@ +--- + +DOCUMENT_ROOT: "{{ lookup('env','WEB_DOCUMENT_ROOT') }}" diff --git a/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml new file mode 100644 index 000000000..bf82e5d64 --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -0,0 +1,115 @@ +--- + +- name: Set apache vhost file [RedHat family] + set_fact: + apache_docker_vhost: /etc/httpd/conf.d/docker.conf + when: ansible_os_family == 'RedHat' + +- name: Set apache vhost file [Debian family] + set_fact: + apache_docker_vhost: /etc/apache2/sites-enabled/10-docker.conf + when: ansible_os_family == 'Debian' + +- name: Set apache vhost file [Alpine family] + set_fact: + apache_docker_vhost: /etc/apache2/conf.d/docker.conf + when: ansible_os_family == 'Alpine' + +- name: Enable apache main config + file: + src: '/opt/docker/etc/httpd/main.conf' + dest: '{{ apache_docker_vhost }}' + state: link + force: yes + +- name: Ensure document root is available + file: + path: "{{ DOCUMENT_ROOT }}" + state: directory + recurse: yes + +- name: Ensure /var/run/apache2 exists + file: + path: '/var/run/apache2' + state: directory + recurse: yes + +- name: Ensure /run/apache2 exists + file: + path: '/run/apache2' + state: directory + recurse: yes + when: ansible_os_family == 'Alpine' + +- name: Switch MPM to worker [RedHat family] + lineinfile: + dest: '/etc/httpd/conf.modules.d/00-mpm.conf' + regexp: '^[\s#]*{{ item.line }}' + line: '{{ item.prefix }}{{ item.line }}' + with_items: + - { line: 'LoadModule mpm_prefork_module modules/mod_mpm_prefork.so', prefix: "#" } + - { line: 'LoadModule mpm_event_module modules/mod_mpm_event.so', prefix: "" } + when: ansible_os_family == 'RedHat' + +- name: Switch MPM to event for Apache 2.4 and higher [Ubuntu family] + command: "{{ item }}" + with_items: + - 'a2dismod mpm_event' + - 'a2enmod mpm_event' + when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + +- name: Manage modules [Alpine family] + lineinfile: + dest: '/etc/apache2/httpd.conf' + regexp: '^[\s#]*{{ item.line }}' + line: '{{ item.prefix }}{{ item.line }}' + with_items: + - { line: 'LoadModule mpm_prefork_module modules/mod_mpm_prefork.so', prefix: "#" } + - { line: 'LoadModule mpm_event_module modules/mod_mpm_event.so', prefix: "" } + - { line: 'LoadModule deflate_module modules/mod_deflate.so', prefix: "" } + - { line: 'LoadModule rewrite_module modules/mod_rewrite.so', prefix: "" } + - { line: 'LoadModule logio_module modules/mod_logio.so', prefix: "" } + - { line: 'LoadModule slotmem_shm_module modules/mod_slotmem_shm.so', prefix: "" } + - { line: 'LoadModule actions_module modules/mod_actions.so', prefix: "" } + - { line: 'LoadModule expires_module modules/mod_expires.so', prefix: "" } + when: ansible_os_family == 'Alpine' + +- name: Fix ssl support [Alpine family] + lineinfile: + dest: '/etc/apache2/conf.d/ssl.conf' + regexp: '{{ item.regexp }}' + line: '{{ item.line }}' + with_items: + - { regexp: 'LoadModule ssl_module', line: 'LoadModule ssl_module /usr/lib/apache2/mod_ssl.so' } + - { regexp: 'LoadModule socache_shmcb_module', line: 'LoadModule socache_shmcb_module /usr/lib/apache2/mod_socache_shmcb.so' } + when: ansible_os_family == 'Alpine' + +- name: Disable proxy [Alpine family] + lineinfile: + dest: '/etc/apache2/conf.d/proxy.conf' + regexp: '^[\s#]*{{ item.line }}' + line: '{{ item.prefix }}{{ item.line }}' + with_items: + - { line: 'LoadModule proxy_ajp_module modules/mod_proxy_ajp.so', prefix: "#" } + - { line: 'LoadModule proxy_connect_module modules/mod_proxy_connect.so', prefix: "#" } + - { line: 'LoadModule proxy_balancer_module modules/mod_proxy_balancer.so', prefix: "#" } + - { line: 'LoadModule proxy_express_module modules/mod_proxy_express.so', prefix: "#" } + - { line: 'LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so', prefix: "" } + - { line: 'LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so', prefix: "#" } + - { line: 'LoadModule proxy_ftp_module modules/mod_proxy_ftp.so', prefix: "#" } + - { line: 'LoadModule proxy_http_module modules/mod_proxy_http.so', prefix: "#" } + - { line: 'LoadModule proxy_scgi_module modules/mod_proxy_scgi.so', prefix: "#" } + when: ansible_os_family == 'Alpine' + +- name: Fix rights of ssl files + file: + path: "{{ item.path }}" + state: "{{ item.state }}" + mode: "{{ item.mode }}" + owner: "root" + group: "root" + with_items: + - { path: '/opt/docker/etc/httpd/ssl', state: 'directory', mode: '0750' } + - { path: '/opt/docker/etc/httpd/ssl/server.crt', state: 'file', mode: '0640' } + - { path: '/opt/docker/etc/httpd/ssl/server.csr', state: 'file', mode: '0640' } + - { path: '/opt/docker/etc/httpd/ssl/server.key', state: 'file', mode: '0640' } diff --git a/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/main.yml b/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-php-apache/defaults/main.yml b/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-php-apache/defaults/main.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-php-apache/defaults/main.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml b/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml new file mode 100644 index 000000000..ad5fb2121 --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml @@ -0,0 +1,8 @@ +--- +- name: Restrict php-fpm to local connection + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "127.0.0.1:9000" } diff --git a/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml b/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/main.yml b/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/main.yml new file mode 100644 index 000000000..7895a52a9 --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/main.yml @@ -0,0 +1,9 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap + +- include: entrypoint.yml + tags: + - entrypoint diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile new file mode 100644 index 000000000..2b7268fdc --- /dev/null +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -0,0 +1,21 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-dev:centos-7-php56 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:centos-7-php56 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=6 +LABEL io.webdevops.version=0.23.0 + +COPY conf/ /opt/docker/ + +RUN /usr/local/bin/yum-install \ + # Install tools + graphviz \ + # Install php development stuff + php56w-pecl-xdebug \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ + && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-dev/centos-7-php56/Dockerfile.jinja2 new file mode 100644 index 000000000..ec60cec8b --- /dev/null +++ b/docker/php-dev/centos-7-php56/Dockerfile.jinja2 @@ -0,0 +1,7 @@ +{{ docker.from("php", "centos-7-php56") }} + +{{ docker.version() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ php5dev.webtatic() }} diff --git a/docker/php-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf new file mode 100644 index 000000000..98ffb37d4 --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf @@ -0,0 +1,6 @@ +# EnableSendfile: Control whether the sendfile kernel support is +# used to deliver files (assuming that the OS supports it). +# The default is on; turn this off if you serve from NFS-mounted +# filesystems. Please see +# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile +EnableSendfile off diff --git a/docker/php-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..8181e24d8 --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -0,0 +1,7 @@ +FileETag None + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + diff --git a/docker/php-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf new file mode 100644 index 000000000..4a6eaa050 --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -0,0 +1,5 @@ +location / { + try_files $uri $uri/ /?$query_string; + expires 0; + add_header Cache-Control private; +} diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..7293c52a3 --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -0,0 +1,6 @@ +--- + +- include: bootstrap/tools.yml +- include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..c9e0154b7 --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Configure php-fpm pool user (www.conf) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml new file mode 100644 index 000000000..9c243a671 --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml @@ -0,0 +1,14 @@ +--- + +- name: Setup php.ini for development environment + lineinfile: + dest: '/opt/docker/etc/php/php.webdevops.ini' + regexp: '^[\s;]*{{ item.variable }}[\s]*=' + line: '{{ item.variable }} = {{ item.value }}' + with_items: + - { variable: 'opcache.memory_consumption', value: '256' } + - { variable: 'opcache.validate_timestamps', value: '1' } + - { variable: 'opcache.revalidate_freq', value: '0' } + - { variable: 'opcache.interned_strings_buffer', value: '16' } + - { variable: 'opcache.max_accelerated_files', value: '7963' } + - { variable: 'opcache.fast_shutdown', value: '1' } diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml new file mode 100644 index 000000000..885cb22a2 --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml @@ -0,0 +1,25 @@ +--- + +# Ignored on php7 +- name: Fix php xdebug module [Alpine family] + lineinfile: + dest: '/etc/php/conf.d/xdebug.ini' + regexp: 'extension=xdebug.so' + line: 'zend_extension=xdebug.so' + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Setup php.ini for development environment + lineinfile: + dest: '/opt/docker/etc/php/php.webdevops.ini' + regexp: '^[\s;]*{{ item.variable }}[\s]*=' + line: '{{ item.variable }} = {{ item.value }}' + with_items: + - { variable: 'xdebug.remote_enable', value: '1' } + - { variable: 'xdebug.remote_connect_back', value: '1' } + - { variable: 'xdebug.idekey', value: 'docker' } + - { variable: 'xdebug.cli_color', value: '1' } + - { variable: 'xdebug.max_nesting_level', value: '1000' } + - { variable: 'xdebug.profiler_enable_trigger', value: '1000' } + - { variable: 'xdebug.profiler_output_dir', value: '/tmp/debug/' } + - { variable: 'xhprof.output_dir', value: '/tmp/debug/' } diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml new file mode 100644 index 000000000..c49cb0e34 --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml @@ -0,0 +1,23 @@ +--- + +- name: Downloading Tools + shell: curl -o "{{ item.dest }}" "{{ item.url }}" && chmod 755 "{{ item.dest }}" + with_items: + - { url: "https://phar.phpunit.de/phploc.phar", dest: /usr/local/bin/phploc } + - { url: "https://phar.phpunit.de/phpunit.phar", dest: /usr/local/bin/phpunit } + - { url: "http://static.pdepend.org/php/latest/pdepend.phar", dest: /usr/local/bin/pdepend } + - { url: "http://static.phpmd.org/php/latest/phpmd.phar", dest: /usr/local/bin/phpmd } + - { url: "https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar", dest: /usr/local/bin/phpcs } + - { url: "https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar", dest: /usr/local/bin/phpcbf } + - { url: "https://phar.phpunit.de/phpcpd.phar", dest: /usr/local/bin/phpcpd } + - { url: "https://phar.phpunit.de/phpdcd.phar", dest: /usr/local/bin/phpdcd } + - { url: "https://github.com/Halleck45/PhpMetrics/raw/master/build/phpmetrics.phar", dest: /usr/local/bin/phpmetrics } + - { url: "http://get.sensiolabs.org/php-cs-fixer.phar", dest: /usr/local/bin/php-cs-fixer } + - { url: "https://github.com/sensiolabs-de/deprecation-detector/releases/download/0.1.0-alpha4/deprecation-detector.phar", dest: /usr/local/bin/deprecation-detector } + - { url: "https://github.com/sensiolabs-de/deprecation-detector/releases/download/0.1.0-alpha4/deprecation-detector.phar", dest: /usr/local/bin/deprecation-detector } + +- name: Install Tools via composer + raw: COMPOSER_HOME="/usr/local/composer" COMPOSER_BIN_DIR="/usr/local/bin" composer global require "{{ item.package }}" "{{ item.version }}" + with_items: + - { package: "sstalle/php7cc" , version: "*" } + - { package: "phpspec/phpspec" , version: "~2.0" } diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/main.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml new file mode 100644 index 000000000..8075b2d9d --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml @@ -0,0 +1,9 @@ +--- + +- name: Disable sendfile for nginx + lineinfile: + dest: /etc/nginx/nginx.conf + regexp: '[\s;]*{{ item.key }}[\s]*' + line: '{{ item.key }} {{ item.value }};' + with_items: + - { key: 'sendfile', value: "off" } diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile new file mode 100644 index 000000000..86a58265a --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -0,0 +1,26 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx-dev:centos-7-php56 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-dev:centos-7-php56 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=6 +LABEL io.webdevops.version=0.23.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install tools +RUN /usr/local/bin/yum-install \ + nginx \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 new file mode 100644 index 000000000..3fa3fca14 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("php-dev", "centos-7-php56") }} + +{{ docker.version() }} + +{{ docker.environmentWeb() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ nginx.centos('php-nginx php-nginx-dev') }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/nginx.sh b/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/nginx.sh new file mode 100644 index 000000000..c4ebf64b5 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/nginx.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +set -e + +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Replace markers +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +exec /usr/sbin/nginx diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf new file mode 100644 index 000000000..98ffb37d4 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf @@ -0,0 +1,6 @@ +# EnableSendfile: Control whether the sendfile kernel support is +# used to deliver files (assuming that the OS supports it). +# The default is on; turn this off if you serve from NFS-mounted +# filesystems. Please see +# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile +EnableSendfile off diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..8181e24d8 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -0,0 +1,7 @@ +FileETag None + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/conf.d/10-php.conf new file mode 100644 index 000000000..4cdbc305f --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/conf.d/10-php.conf @@ -0,0 +1,3 @@ +upstream php { + server 127.0.0.1:9000; +} diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/global.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/main.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/main.conf new file mode 100644 index 000000000..06de0651b --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/main.conf @@ -0,0 +1,4 @@ +include /opt/docker/etc/nginx/global.conf; +include /opt/docker/etc/nginx/php.conf; +include /opt/docker/etc/nginx/conf.d/*.conf; +include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/nginx.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/nginx.conf new file mode 100644 index 000000000..f5609826d --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/nginx.conf @@ -0,0 +1,35 @@ +# For more information on configuration, see: +# * Official English Documentation: http://nginx.org/en/docs/ +# * Official Russian Documentation: http://nginx.org/ru/docs/ + +user nginx; +worker_processes auto; +error_log /var/log/nginx/error.log; +pid /run/nginx.pid; + +events { + worker_connections 1024; +} + +http { + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + # Load modular configuration files from the /etc/nginx/conf.d directory. + # See http://nginx.org/en/docs/ngx_core_module.html#include + # for more information. + include /etc/nginx/conf.d/*.conf; +} +daemon off; diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/php.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/ssl/server.crt b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/ssl/server.csr b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/ssl/server.key b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.conf new file mode 100644 index 000000000..a5df62ef8 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.conf @@ -0,0 +1,2 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate +include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf new file mode 100644 index 000000000..4a6eaa050 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -0,0 +1,5 @@ +location / { + try_files $uri $uri/ /?$query_string; + expires 0; + add_header Cache-Control private; +} diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-php.conf new file mode 100644 index 000000000..1f27f74f6 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-php.conf @@ -0,0 +1,18 @@ +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-php56/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.conf new file mode 100644 index 000000000..33e10bfce --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.conf @@ -0,0 +1,38 @@ +server { + listen 80 default_server; + listen 8000 default_server; + + server_name _ docker; + + access_log /dev/stdout; + error_log /dev/stdout info; + + root ""; + index ; + + client_max_body_size 50m; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; +} + +############## +# SSL +############## + +server { + listen 443 default_server; + listen 8443 default_server; + + server_name _ docker; + + access_log /dev/stdout; + error_log /dev/stdout info; + + root ""; + index ; + + client_max_body_size 50m; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; + include /opt/docker/etc/nginx/vhost.ssl.conf; +} diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.ssl.conf new file mode 100644 index 000000000..4ddba251d --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.ssl.conf @@ -0,0 +1,7 @@ +ssl on; +ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive +ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; +ssl_prefer_server_ciphers on; + +ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; +ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/supervisor.d/nginx.conf new file mode 100644 index 000000000..657bf499b --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/supervisor.d/nginx.conf @@ -0,0 +1,14 @@ +[group:nginx] +programs=nginxd +priority=20 + +[program:nginxd] +command = /opt/docker/bin/service.d/nginx.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx/defaults/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx/defaults/main.yml new file mode 100644 index 000000000..69cba1cb4 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx/defaults/main.yml @@ -0,0 +1,3 @@ +--- + +DOCUMENT_ROOT: "{{ lookup('env','WEB_DOCUMENT_ROOT') }}" diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml new file mode 100644 index 000000000..ca34d3dd3 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -0,0 +1,48 @@ +--- + +- name: Diable nginx demonize mode + lineinfile: + dest: /etc/nginx/nginx.conf + regexp: '[\s;]*{{ item.key }}[\s]*' + line: '{{ item.key }} {{ item.value }};' + with_items: + - { key: 'daemon', value: "off" } + +- name: Enable nginx main config + file: + src: '/opt/docker/etc/nginx/main.conf' + dest: '/etc/nginx/conf.d/10-docker.conf' + state: link + force: yes + +- name: Remove default vhost + file: + path: "/etc/nginx/sites-enabled/default" + state: absent + +- name: Replace default nginx.conf [RedHat/Alpine family] + file: + src: '/opt/docker/etc/nginx/nginx.conf' + dest: '/etc/nginx/nginx.conf' + state: link + force: yes + when: ansible_os_family == 'RedHat' or ansible_os_family == 'Alpine' + +- name: Ensure document root is available + file: + path: "{{ DOCUMENT_ROOT }}" + state: directory + recurse: yes + +- name: Fix rights of ssl files + file: + path: "{{ item.path }}" + state: "{{ item.state }}" + mode: "{{ item.mode }}" + owner: "root" + group: "root" + with_items: + - { path: '/opt/docker/etc/nginx/ssl', state: 'directory', mode: '0750' } + - { path: '/opt/docker/etc/nginx/ssl/server.crt', state: 'file', mode: '0640' } + - { path: '/opt/docker/etc/nginx/ssl/server.csr', state: 'file', mode: '0640' } + - { path: '/opt/docker/etc/nginx/ssl/server.key', state: 'file', mode: '0640' } diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..7293c52a3 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -0,0 +1,6 @@ +--- + +- include: bootstrap/tools.yml +- include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..c9e0154b7 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Configure php-fpm pool user (www.conf) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml new file mode 100644 index 000000000..9c243a671 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml @@ -0,0 +1,14 @@ +--- + +- name: Setup php.ini for development environment + lineinfile: + dest: '/opt/docker/etc/php/php.webdevops.ini' + regexp: '^[\s;]*{{ item.variable }}[\s]*=' + line: '{{ item.variable }} = {{ item.value }}' + with_items: + - { variable: 'opcache.memory_consumption', value: '256' } + - { variable: 'opcache.validate_timestamps', value: '1' } + - { variable: 'opcache.revalidate_freq', value: '0' } + - { variable: 'opcache.interned_strings_buffer', value: '16' } + - { variable: 'opcache.max_accelerated_files', value: '7963' } + - { variable: 'opcache.fast_shutdown', value: '1' } diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml new file mode 100644 index 000000000..885cb22a2 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml @@ -0,0 +1,25 @@ +--- + +# Ignored on php7 +- name: Fix php xdebug module [Alpine family] + lineinfile: + dest: '/etc/php/conf.d/xdebug.ini' + regexp: 'extension=xdebug.so' + line: 'zend_extension=xdebug.so' + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Setup php.ini for development environment + lineinfile: + dest: '/opt/docker/etc/php/php.webdevops.ini' + regexp: '^[\s;]*{{ item.variable }}[\s]*=' + line: '{{ item.variable }} = {{ item.value }}' + with_items: + - { variable: 'xdebug.remote_enable', value: '1' } + - { variable: 'xdebug.remote_connect_back', value: '1' } + - { variable: 'xdebug.idekey', value: 'docker' } + - { variable: 'xdebug.cli_color', value: '1' } + - { variable: 'xdebug.max_nesting_level', value: '1000' } + - { variable: 'xdebug.profiler_enable_trigger', value: '1000' } + - { variable: 'xdebug.profiler_output_dir', value: '/tmp/debug/' } + - { variable: 'xhprof.output_dir', value: '/tmp/debug/' } diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml new file mode 100644 index 000000000..c49cb0e34 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml @@ -0,0 +1,23 @@ +--- + +- name: Downloading Tools + shell: curl -o "{{ item.dest }}" "{{ item.url }}" && chmod 755 "{{ item.dest }}" + with_items: + - { url: "https://phar.phpunit.de/phploc.phar", dest: /usr/local/bin/phploc } + - { url: "https://phar.phpunit.de/phpunit.phar", dest: /usr/local/bin/phpunit } + - { url: "http://static.pdepend.org/php/latest/pdepend.phar", dest: /usr/local/bin/pdepend } + - { url: "http://static.phpmd.org/php/latest/phpmd.phar", dest: /usr/local/bin/phpmd } + - { url: "https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar", dest: /usr/local/bin/phpcs } + - { url: "https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar", dest: /usr/local/bin/phpcbf } + - { url: "https://phar.phpunit.de/phpcpd.phar", dest: /usr/local/bin/phpcpd } + - { url: "https://phar.phpunit.de/phpdcd.phar", dest: /usr/local/bin/phpdcd } + - { url: "https://github.com/Halleck45/PhpMetrics/raw/master/build/phpmetrics.phar", dest: /usr/local/bin/phpmetrics } + - { url: "http://get.sensiolabs.org/php-cs-fixer.phar", dest: /usr/local/bin/php-cs-fixer } + - { url: "https://github.com/sensiolabs-de/deprecation-detector/releases/download/0.1.0-alpha4/deprecation-detector.phar", dest: /usr/local/bin/deprecation-detector } + - { url: "https://github.com/sensiolabs-de/deprecation-detector/releases/download/0.1.0-alpha4/deprecation-detector.phar", dest: /usr/local/bin/deprecation-detector } + +- name: Install Tools via composer + raw: COMPOSER_HOME="/usr/local/composer" COMPOSER_BIN_DIR="/usr/local/bin" composer global require "{{ item.package }}" "{{ item.version }}" + with_items: + - { package: "sstalle/php7cc" , version: "*" } + - { package: "phpspec/phpspec" , version: "~2.0" } diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml new file mode 100644 index 000000000..8075b2d9d --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml @@ -0,0 +1,9 @@ +--- + +- name: Disable sendfile for nginx + lineinfile: + dest: /etc/nginx/nginx.conf + regexp: '[\s;]*{{ item.key }}[\s]*' + line: '{{ item.key }} {{ item.value }};' + with_items: + - { key: 'sendfile', value: "off" } diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx/defaults/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx/defaults/main.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx/defaults/main.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml new file mode 100644 index 000000000..a2866e0d0 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml @@ -0,0 +1,9 @@ +--- + +- name: Restrict php-fpm to local connection + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "127.0.0.1:9000" } diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/main.yml new file mode 100644 index 000000000..7895a52a9 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/main.yml @@ -0,0 +1,9 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap + +- include: entrypoint.yml + tags: + - entrypoint diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile new file mode 100644 index 000000000..a919c827b --- /dev/null +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -0,0 +1,26 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx:centos-7-php56 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:centos-7-php56 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=6 +LABEL io.webdevops.version=0.23.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +# Install tools +RUN /usr/local/bin/yum-install \ + nginx \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 b/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 new file mode 100644 index 000000000..60be47c7f --- /dev/null +++ b/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("php", "centos-7-php56") }} + +{{ docker.version() }} + +{{ docker.environmentWeb() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ nginx.centos('php-nginx') }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/centos-7-php56/conf/bin/service.d/nginx.sh b/docker/php-nginx/centos-7-php56/conf/bin/service.d/nginx.sh new file mode 100644 index 000000000..c4ebf64b5 --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/bin/service.d/nginx.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +set -e + +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Replace markers +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +exec /usr/sbin/nginx diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/centos-7-php56/conf/etc/nginx/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/conf.d/10-php.conf new file mode 100644 index 000000000..4cdbc305f --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/etc/nginx/conf.d/10-php.conf @@ -0,0 +1,3 @@ +upstream php { + server 127.0.0.1:9000; +} diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/global.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/etc/nginx/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/main.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/main.conf new file mode 100644 index 000000000..06de0651b --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/etc/nginx/main.conf @@ -0,0 +1,4 @@ +include /opt/docker/etc/nginx/global.conf; +include /opt/docker/etc/nginx/php.conf; +include /opt/docker/etc/nginx/conf.d/*.conf; +include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/nginx.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/nginx.conf new file mode 100644 index 000000000..f5609826d --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/etc/nginx/nginx.conf @@ -0,0 +1,35 @@ +# For more information on configuration, see: +# * Official English Documentation: http://nginx.org/en/docs/ +# * Official Russian Documentation: http://nginx.org/ru/docs/ + +user nginx; +worker_processes auto; +error_log /var/log/nginx/error.log; +pid /run/nginx.pid; + +events { + worker_connections 1024; +} + +http { + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + # Load modular configuration files from the /etc/nginx/conf.d directory. + # See http://nginx.org/en/docs/ngx_core_module.html#include + # for more information. + include /etc/nginx/conf.d/*.conf; +} +daemon off; diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/php.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/etc/nginx/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.key b/docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.conf new file mode 100644 index 000000000..a5df62ef8 --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.conf @@ -0,0 +1,2 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate +include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf new file mode 100644 index 000000000..28fd811bc --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -0,0 +1,3 @@ +location / { + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-php.conf new file mode 100644 index 000000000..1f27f74f6 --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-php.conf @@ -0,0 +1,18 @@ +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-php56/conf/etc/nginx/vhost.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.conf new file mode 100644 index 000000000..33e10bfce --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.conf @@ -0,0 +1,38 @@ +server { + listen 80 default_server; + listen 8000 default_server; + + server_name _ docker; + + access_log /dev/stdout; + error_log /dev/stdout info; + + root ""; + index ; + + client_max_body_size 50m; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; +} + +############## +# SSL +############## + +server { + listen 443 default_server; + listen 8443 default_server; + + server_name _ docker; + + access_log /dev/stdout; + error_log /dev/stdout info; + + root ""; + index ; + + client_max_body_size 50m; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; + include /opt/docker/etc/nginx/vhost.ssl.conf; +} diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.ssl.conf new file mode 100644 index 000000000..4ddba251d --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.ssl.conf @@ -0,0 +1,7 @@ +ssl on; +ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive +ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; +ssl_prefer_server_ciphers on; + +ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; +ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/centos-7-php56/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/centos-7-php56/conf/etc/supervisor.d/nginx.conf new file mode 100644 index 000000000..657bf499b --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/etc/supervisor.d/nginx.conf @@ -0,0 +1,14 @@ +[group:nginx] +programs=nginxd +priority=20 + +[program:nginxd] +command = /opt/docker/bin/service.d/nginx.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-nginx/defaults/main.yml b/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-nginx/defaults/main.yml new file mode 100644 index 000000000..69cba1cb4 --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-nginx/defaults/main.yml @@ -0,0 +1,3 @@ +--- + +DOCUMENT_ROOT: "{{ lookup('env','WEB_DOCUMENT_ROOT') }}" diff --git a/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml new file mode 100644 index 000000000..ca34d3dd3 --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -0,0 +1,48 @@ +--- + +- name: Diable nginx demonize mode + lineinfile: + dest: /etc/nginx/nginx.conf + regexp: '[\s;]*{{ item.key }}[\s]*' + line: '{{ item.key }} {{ item.value }};' + with_items: + - { key: 'daemon', value: "off" } + +- name: Enable nginx main config + file: + src: '/opt/docker/etc/nginx/main.conf' + dest: '/etc/nginx/conf.d/10-docker.conf' + state: link + force: yes + +- name: Remove default vhost + file: + path: "/etc/nginx/sites-enabled/default" + state: absent + +- name: Replace default nginx.conf [RedHat/Alpine family] + file: + src: '/opt/docker/etc/nginx/nginx.conf' + dest: '/etc/nginx/nginx.conf' + state: link + force: yes + when: ansible_os_family == 'RedHat' or ansible_os_family == 'Alpine' + +- name: Ensure document root is available + file: + path: "{{ DOCUMENT_ROOT }}" + state: directory + recurse: yes + +- name: Fix rights of ssl files + file: + path: "{{ item.path }}" + state: "{{ item.state }}" + mode: "{{ item.mode }}" + owner: "root" + group: "root" + with_items: + - { path: '/opt/docker/etc/nginx/ssl', state: 'directory', mode: '0750' } + - { path: '/opt/docker/etc/nginx/ssl/server.crt', state: 'file', mode: '0640' } + - { path: '/opt/docker/etc/nginx/ssl/server.csr', state: 'file', mode: '0640' } + - { path: '/opt/docker/etc/nginx/ssl/server.key', state: 'file', mode: '0640' } diff --git a/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/main.yml b/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-nginx/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-php-nginx/defaults/main.yml b/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-php-nginx/defaults/main.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-php-nginx/defaults/main.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml b/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml new file mode 100644 index 000000000..a2866e0d0 --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml @@ -0,0 +1,9 @@ +--- + +- name: Restrict php-fpm to local connection + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "127.0.0.1:9000" } diff --git a/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml b/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/main.yml b/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/main.yml new file mode 100644 index 000000000..7895a52a9 --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/main.yml @@ -0,0 +1,9 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap + +- include: entrypoint.yml + tags: + - entrypoint diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile new file mode 100644 index 000000000..61f0a571b --- /dev/null +++ b/docker/php/centos-7-php56/Dockerfile @@ -0,0 +1,58 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php:centos-7-php56 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/base-app:centos-7 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=6 +LABEL io.webdevops.version=0.23.0 + +ENV WEB_DOCUMENT_ROOT /app +ENV WEB_DOCUMENT_INDEX index.php +ENV WEB_ALIAS_DOMAIN *.vm + +COPY conf/ /opt/docker/ + +RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ + && /usr/local/bin/yum-install \ + # Install tools + ImageMagick \ + GraphicsMagick \ + # Install php (cli/fpm) + php56w-cli \ + php56w-fpm \ + php56w-common \ + php56w-intl \ + php56w-mysqlnd \ + php56w-pecl-memcached \ + php56w-mcrypt \ + php56w-gd \ + php56w-mbstring \ + php56w-bcmath \ + php56w-soap \ + sqlite \ + php56w-xmlrpc \ + php56w-xml \ + geoip \ + php56w-ldap \ + ImageMagick-devel \ + ImageMagick-perl \ + php56w-pear \ + php56w-devel \ + gcc \ + make \ + php56w-opcache \ + && pear channel-update pear.php.net \ + && pear upgrade-all \ + && pear config-set auto_discover 1 \ + && pecl install imagick \ + && pecl install redis \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ + && /opt/docker/bin/bootstrap.sh + + +EXPOSE 9000 \ No newline at end of file diff --git a/docker/php/centos-7-php56/Dockerfile.jinja2 b/docker/php/centos-7-php56/Dockerfile.jinja2 new file mode 100644 index 000000000..78475a65e --- /dev/null +++ b/docker/php/centos-7-php56/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("base-app", "centos-7") }} + +{{ docker.version() }} + +{{ docker.environmentWeb() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ php5.webtatic() }} + +{{ docker.expose('9000') }} \ No newline at end of file diff --git a/docker/php/centos-7-php56/conf/etc/logrotate.d/php5-fpm b/docker/php/centos-7-php56/conf/etc/logrotate.d/php5-fpm new file mode 100644 index 000000000..e6ef4b123 --- /dev/null +++ b/docker/php/centos-7-php56/conf/etc/logrotate.d/php5-fpm @@ -0,0 +1,12 @@ +/var/log/php5-fpm/fpm.log +/var/log/php5-fpm/access.log +/var/log/php5-fpm/slow.log +/var/log/php5-fpm/error.log { + missingok + notifempty + sharedscripts + delaycompress + postrotate + /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true + endscript +} diff --git a/docker/php/centos-7-php56/conf/etc/php/conf.d/.gitkeep b/docker/php/centos-7-php56/conf/etc/php/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php/centos-7-php56/conf/etc/php/php.ini b/docker/php/centos-7-php56/conf/etc/php/php.ini new file mode 100644 index 000000000..447212118 --- /dev/null +++ b/docker/php/centos-7-php56/conf/etc/php/php.ini @@ -0,0 +1 @@ +; placeholder diff --git a/docker/php/centos-7-php56/conf/etc/php/php.webdevops.ini b/docker/php/centos-7-php56/conf/etc/php/php.webdevops.ini new file mode 100644 index 000000000..b95068e9c --- /dev/null +++ b/docker/php/centos-7-php56/conf/etc/php/php.webdevops.ini @@ -0,0 +1,36 @@ +; ------------------------------------- +; Docker Webdevops PHP configuration +; ------------------------------------- + +; this file will overwrite default php.ini settings + +display_errors = 0 + +short_open_tag = Off +variables_order = 'GPCS' +request_order = 'GP' + +allow_url_fopen = On +allow_url_include = Off + +memory_limit = 512M +max_execution_time = 300 +max_input_time = 300 +post_max_size = 50M +upload_max_filesize = 50M +max_input_vars = 5000 + +expose_php = Off + +date.timezone = UTC + +mysql.default_host = mysql +mysqli.default_host = mysql + + +opcache.memory_consumption = 256 +opcache.revalidate_freq = 0 +opcache.validate_timestamps = 0 +opcache.interned_strings_buffer = 16 +opcache.max_accelerated_files = 7963 +opcache.fast_shutdown = 1 diff --git a/docker/php/centos-7-php56/conf/etc/supervisor.d/php-fpm.conf b/docker/php/centos-7-php56/conf/etc/supervisor.d/php-fpm.conf new file mode 100644 index 000000000..33e894d11 --- /dev/null +++ b/docker/php/centos-7-php56/conf/etc/supervisor.d/php-fpm.conf @@ -0,0 +1,54 @@ +[group:php-fpm] +programs=php-fpmd,php-fpm-log-fpm,php-fpm-log-slow,php-fpm-log-error,php-fpm-log-access +priority=20 + +[program:php-fpmd] +command = /usr/sbin/php-fpm --nodaemonize +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 + +[program:php-fpm-log-fpm] +command = bash /opt/docker/bin/logwatch.sh php:fpm /var/log/php5-fpm/fpm.log +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 + +[program:php-fpm-log-slow] +command = bash /opt/docker/bin/logwatch.sh php:slow /var/log/php5-fpm/slow.log +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 + +[program:php-fpm-log-error] +command = bash /opt/docker/bin/logwatch.sh php:error /var/log/php5-fpm/error.log +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 + +[program:php-fpm-log-access] +command = bash /opt/docker/bin/logwatch.sh php:access /var/log/php5-fpm/access.log +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/defaults/main.yml b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap.yml new file mode 100644 index 000000000..5883fa1fe --- /dev/null +++ b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap.yml @@ -0,0 +1,6 @@ +--- + +- include: bootstrap/php.yml +- include: bootstrap/php-fpm.main.yml +- include: bootstrap/php-fpm.pool.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml new file mode 100644 index 000000000..dcdaa60fe --- /dev/null +++ b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -0,0 +1,48 @@ +--- + +- name: Set php main file + set_fact: + php_main_conf: /etc/php-fpm.conf + when: ansible_os_family == 'RedHat' + +- name: Set php main file + set_fact: + php_main_conf: /etc/php5/fpm/php-fpm.conf + when: ansible_os_family == 'Debian' + +- name: Set php main file + set_fact: + php_main_conf: /etc/php/php-fpm.conf + when: ansible_os_family == 'Alpine' + +- name: Set php main file + set_fact: + php_main_conf: /etc/php/php-fpm.conf + when: ansible_os_family == 'Alpine' + +- name: Move php-fpm main file to /opt/docker/etc/php/fpm/ + command: "mv {{ php_main_conf }} /opt/docker/etc/php/fpm/php-fpm.conf" + args: + creates: /opt/docker/etc/php/fpm/php-fpm.conf + +- name: Remove php-fpm main file + file: + path: "{{ php_main_conf }}" + state: absent + +- name: Symlink php-fpm main file + file: + path: "{{ php_main_conf }}" + src: "/opt/docker/etc/php/fpm/php-fpm.conf" + state: link + owner: "root" + group: "root" + +- name: Configure php-fpm main + lineinfile: + dest: '/opt/docker/etc/php/fpm/php-fpm.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'error_log', value: "/var/log/php5-fpm/fpm.log" } + - { key: 'pid', value: "/var/run/php5-fpm.pid" } diff --git a/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml new file mode 100644 index 000000000..c64a89e93 --- /dev/null +++ b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -0,0 +1,90 @@ +--- + +- name: Get php version + command: "php -r 'echo phpversion();'" + changed_when: true + register: php_version_cmd + ignore_errors: true + +- name: Set php_version version + set_fact: + php_version: "{{php_version_cmd.stdout}}" + +- debug: + msg: "PHP-Version: {{php_version}}" + +- name: Set php pool file + set_fact: + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + when: ansible_os_family == 'RedHat' + +- name: Set php pool file + set_fact: + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm/pool.d + when: ansible_os_family == 'Debian' + +- name: Set php pool file + set_fact: + php_pool_conf: www.conf + php_pool_dir: /etc/php/fpm.d + when: ansible_os_family == 'Alpine' + +- name: Move php-fpm pool directory file to /opt/docker/etc/php/ + command: "mv {{ php_pool_dir }} /opt/docker/etc/php/fpm/pool.d" + args: + creates: /opt/docker/etc/php/fpm/pool.d + +- name: Rename pool file file to application.conf" + command: "mv /opt/docker/etc/php/fpm/pool.d/{{ php_pool_conf }} /opt/docker/etc/php/fpm/pool.d/application.conf" + args: + creates: /opt/docker/etc/php/fpm/pool.d/application.conf + +- name: Remove php-fpm pool directory + file: + path: "{{ php_pool_dir }}" + state: absent + +- name: Symlink php-fpm main file + file: + path: "{{ php_pool_dir }}" + src: "/opt/docker/etc/php/fpm/pool.d" + state: link + owner: "root" + group: "root" + +- name: Configure php-fpm pool user (www.conf) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } + - { key: 'catch_workers_output', value: "yes" } + - { key: 'access.log', value: "/var/log/php5-fpm/access.log" } + - { key: 'slowlog', value: "/var/log/php5-fpm/slow.log" } + - { key: 'php_admin_value[error_log]', value: "/var/log/php5-fpm/error.log" } + - { key: 'php_admin_value[log_errors]', value: "on" } + - { key: 'user', value: "{{ APPLICATION_USER }}" } + - { key: 'group', value: "{{ APPLICATION_GROUP }}" } + +- name: Disable clear env in php-fpm pool + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'clear_env', value: "no" } + when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or + ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or + ( php_version | version_compare('5.6', 'ge') ) + + +- name: Disable php-fpm connection limit + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: ';{{ item.key }}' + with_items: + - { key: 'listen.allowed_clients' } diff --git a/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..d83edb3ae --- /dev/null +++ b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,45 @@ +--- + +- name: Symlink php-fpm binary [Alpine family] + file: + path: "/usr/sbin/php-fpm" + src: "/usr/bin/php-fpm" + state: link + owner: "root" + group: "root" + when: ansible_os_family == 'Alpine' + +- name: Symlink php-fpm binary [Debian family] + file: + path: "/usr/sbin/php-fpm" + src: "/usr/sbin/php5-fpm" + state: link + owner: "root" + group: "root" + when: ansible_os_family == 'Debian' + +- name: Remove default php-fpm logrotate + file: + path: "/etc/logrotate.d/php-fpm" + state: absent + when: ansible_os_family == 'RedHat' + +- name: Create php-fpm log directory + file: + path: "/var/log/php5-fpm/" + state: directory + owner: "root" + group: "root" + +- name: Create php-fpm log files + file: + path: "/var/log/php5-fpm/{{ item }}" + state: touch + owner: "root" + group: "root" + mode: 0600 + with_items: + - slow.log + - access.log + - error.log + - fpm.log diff --git a/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml new file mode 100644 index 000000000..f98a1d53c --- /dev/null +++ b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml @@ -0,0 +1,62 @@ +--- + +- name: Create php directories + file: + path: "{{ item }}" + state: directory + mode: 0755 + owner: "root" + group: "root" + with_items: + - /opt/docker/etc/php/ + - /opt/docker/etc/php/fpm/ + +- name: Create php.ini files + file: + path: "{{ item }}" + state: touch + mode: 0744 + owner: root + group: root + with_items: + - "/opt/docker/etc/php/php.webdevops.ini" + - "/opt/docker/etc/php/php.ini" + +- name: Link php.ini for cli and fpm [Debian family] + file: + src: '{{ item.file }}' + dest: '/etc/php5/{{ item.category }}/conf.d/{{ item.target }}' + force: yes + state: link + with_items: + # PHP cli + - { category: 'cli', file: '/etc/php5/mods-available/mcrypt.ini', target: '20-mcrypt.ini' } + - { category: 'cli', file: '/opt/docker/etc/php/php.webdevops.ini', target: '98-webdevops.ini' } + - { category: 'cli', file: '/opt/docker/etc/php/php.ini', target: '99-docker.ini' } + # PHP fpm + - { category: 'fpm', file: '/etc/php5/mods-available/mcrypt.ini', target: '20-mcrypt.ini' } + - { category: 'fpm', file: '/opt/docker/etc/php/php.webdevops.ini', target: '98-webdevops.ini' } + - { category: 'fpm', file: '/opt/docker/etc/php/php.ini', target: '99-docker.ini' } + when: ansible_os_family == 'Debian' + +- name: Create link for additional php.ini [RedHat family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '/etc/php.d/{{ item.target }}' + state: link + force: yes + with_items: + - { file: 'php.webdevops.ini', target: 'zza-webdevops.ini'} + - { file: 'php.ini', target: 'zzz-docker.ini'} + when: ansible_os_family == 'RedHat' + +- name: Create link for additional php.ini [Alpine family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '/etc/php/conf.d/{{ item.target }}' + state: link + force: yes + with_items: + - { file: 'php.webdevops.ini', target: 'xzza-webdevops.ini'} + - { file: 'php.ini', target: 'xzzz-docker.ini'} + when: ansible_os_family == 'Alpine' diff --git a/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/main.yml b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/template/Dockerfile/images/php5-dev.jinja2 b/template/Dockerfile/images/php5-dev.jinja2 index 11f399221..c0e7ade47 100644 --- a/template/Dockerfile/images/php5-dev.jinja2 +++ b/template/Dockerfile/images/php5-dev.jinja2 @@ -23,6 +23,14 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y {{ provision.runRoleInline('php-dev', role) }} {%- endmacro %} +{% macro webtatic(role='') -%} +RUN /usr/local/bin/yum-install \ + # Install tools + graphviz \ + # Install php development stuff + php56w-pecl-xdebug \ + {{ provision.runRoleInline('php-dev', role) }} +{%- endmacro %} {% macro debian(role='') -%} # Install development environment diff --git a/template/Dockerfile/images/php5.jinja2 b/template/Dockerfile/images/php5.jinja2 index 8c5354191..9dc9f24b0 100644 --- a/template/Dockerfile/images/php5.jinja2 +++ b/template/Dockerfile/images/php5.jinja2 @@ -101,6 +101,44 @@ RUN /usr/local/bin/yum-install \ {{ provision.runRoleInline('php', role) }} {%- endmacro %} +{% macro webtatic(role='') -%} +RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ + && /usr/local/bin/yum-install \ + # Install tools + ImageMagick \ + GraphicsMagick \ + # Install php (cli/fpm) + php56w-cli \ + php56w-fpm \ + php56w-common \ + php56w-intl \ + php56w-mysqlnd \ + php56w-pecl-memcached \ + php56w-mcrypt \ + php56w-gd \ + php56w-mbstring \ + php56w-bcmath \ + php56w-soap \ + sqlite \ + php56w-xmlrpc \ + php56w-xml \ + geoip \ + php56w-ldap \ + ImageMagick-devel \ + ImageMagick-perl \ + php56w-pear \ + php56w-devel \ + gcc \ + make \ + php56w-opcache \ + && pear channel-update pear.php.net \ + && pear upgrade-all \ + && pear config-set auto_discover 1 \ + && pecl install imagick \ + && pecl install redis \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + {{ provision.runRoleInline('php', role) }} +{%- endmacro %} {% macro debian7(role='') -%} # Install php environment diff --git a/test/run.sh b/test/run.sh index 3197efaed..131d40d1a 100755 --- a/test/run.sh +++ b/test/run.sh @@ -324,6 +324,7 @@ initEnvironment setEnvironmentOsFamily "redhat" OS_VERSION="7" runTestForTag "centos-7" + OS_VERSION="7" runTestForTag "centos-7-php56" setEnvironmentOsFamily "debian" OS_VERSION="7" runTestForTag "debian-7" @@ -374,6 +375,7 @@ initEnvironment setEnvironmentOsFamily "redhat" OS_VERSION="7" runTestForTag "centos-7" + OS_VERSION="7" runTestForTag "centos-7-php56" setEnvironmentOsFamily "debian" OS_VERSION="7" runTestForTag "debian-7" @@ -481,6 +483,7 @@ initEnvironment setEnvironmentOsFamily "redhat" OS_VERSION="7" runTestForTag "centos-7" + OS_VERSION="7" runTestForTag "centos-7-php56" setEnvironmentOsFamily "debian" OS_VERSION="7" runTestForTag "debian-7" @@ -531,6 +534,7 @@ initEnvironment setEnvironmentOsFamily "redhat" OS_VERSION="7" runTestForTag "centos-7" + OS_VERSION="7" runTestForTag "centos-7-php56" setEnvironmentOsFamily "debian" OS_VERSION="7" runTestForTag "debian-7" @@ -580,6 +584,7 @@ initEnvironment setEnvironmentOsFamily "redhat" OS_VERSION="7" runTestForTag "centos-7" + OS_VERSION="7" runTestForTag "centos-7-php56" setEnvironmentOsFamily "debian" OS_VERSION="7" runTestForTag "debian-7" @@ -631,6 +636,7 @@ initEnvironment setEnvironmentOsFamily "redhat" OS_VERSION="7" runTestForTag "centos-7" + OS_VERSION="7" runTestForTag "centos-7-php56" setEnvironmentOsFamily "debian" OS_VERSION="7" runTestForTag "debian-7" From 0af348675a0df8fa0ad79908aa7a7cc811e0c388 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Thu, 16 Jun 2016 22:46:59 +0200 Subject: [PATCH 02/15] Apply new layout to centos-7-php56 --- .../php-apache-dev/centos-7-php56/Dockerfile | 8 +++-- .../centos-7-php56/Dockerfile.jinja2 | 6 ++-- .../conf/bin/service.d/httpd.d/10-init.sh | 19 +++++++++++ .../bin/service.d/httpd.d/12-development.sh | 1 + .../conf/bin/service.d/httpd.sh | 13 ++----- .../bin/service.d/nginx.d/12-development.sh | 1 + .../conf/etc/httpd/conf.d/10-php.conf | 4 +-- .../centos-7-php56/conf/etc/httpd/main.conf | 2 ++ .../conf/etc/httpd/vhost.common.d/02-dev.conf | 17 ++++++---- .../conf/etc/nginx/vhost.common.d/02-dev.conf | 4 +++ .../vhost.common.d/10-location-root.conf | 5 --- .../defaults/main.yml | 6 ++++ .../tasks/bootstrap.yml | 3 ++ .../tasks/bootstrap/php-fpm.yml | 9 +++++ .../webdevops-php-apache-dev/tasks/main.yml | 5 +++ .../webdevops-php-apache/tasks/entrypoint.yml | 1 + .../webdevops-php-dev/tasks/bootstrap.yml | 3 +- .../tasks/bootstrap/php-fpm.yml | 8 +++++ .../tasks/bootstrap/php-module.blackfire.yml | 21 ++++++++++++ .../tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-fpm.yml | 9 +++++ docker/php-apache/centos-7-php56/Dockerfile | 5 +-- .../centos-7-php56/Dockerfile.jinja2 | 3 +- .../conf/bin/service.d/httpd.d/10-init.sh | 19 +++++++++++ .../conf/bin/service.d/httpd.sh | 13 ++----- .../conf/etc/httpd/conf.d/10-php.conf | 4 +-- .../centos-7-php56/conf/etc/httpd/main.conf | 2 ++ .../webdevops-php-apache/tasks/entrypoint.yml | 1 + docker/php-dev/centos-7-php56/Dockerfile | 5 +-- .../bin/service.d/httpd.d/12-development.sh | 1 + .../bin/service.d/nginx.d/12-development.sh | 1 + .../conf/etc/httpd/vhost.common.d/02-dev.conf | 17 ++++++---- .../conf/etc/nginx/vhost.common.d/02-dev.conf | 4 +++ .../vhost.common.d/10-location-root.conf | 5 --- .../defaults/main.yml | 6 ++++ .../tasks/bootstrap.yml | 3 ++ .../tasks/bootstrap/php-fpm.yml | 9 +++++ .../webdevops-php-apache-dev/tasks/main.yml | 5 +++ .../webdevops-php-dev/tasks/bootstrap.yml | 3 +- .../tasks/bootstrap/php-fpm.yml | 8 +++++ .../tasks/bootstrap/php-module.blackfire.yml | 21 ++++++++++++ .../tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-fpm.yml | 9 +++++ .../php-nginx-dev/centos-7-php56/Dockerfile | 6 ++-- .../centos-7-php56/Dockerfile.jinja2 | 4 ++- .../bin/service.d/httpd.d/12-development.sh | 1 + .../conf/bin/service.d/nginx.d/10-init.sh | 20 +++++++++++ .../bin/service.d/nginx.d/12-development.sh | 1 + .../conf/bin/service.d/nginx.sh | 13 ++----- .../conf/etc/httpd/vhost.common.d/02-dev.conf | 17 ++++++---- .../conf/etc/nginx/conf.d/10-php.conf | 2 +- .../conf/etc/nginx/vhost.common.d/02-dev.conf | 4 +++ .../vhost.common.d/10-location-root.conf | 4 +-- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ------ .../defaults/main.yml | 6 ++++ .../tasks/bootstrap.yml | 3 ++ .../tasks/bootstrap/php-fpm.yml | 9 +++++ .../webdevops-php-apache-dev/tasks/main.yml | 5 +++ .../webdevops-php-dev/tasks/bootstrap.yml | 3 +- .../tasks/bootstrap/php-fpm.yml | 8 +++++ .../tasks/bootstrap/php-module.blackfire.yml | 21 ++++++++++++ .../tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-fpm.yml | 9 +++++ .../webdevops-php-nginx/tasks/entrypoint.yml | 1 + docker/php-nginx/centos-7-php56/Dockerfile | 5 +-- .../centos-7-php56/Dockerfile.jinja2 | 3 +- .../conf/bin/service.d/nginx.d/10-init.sh | 20 +++++++++++ .../conf/bin/service.d/nginx.sh | 13 ++----- .../conf/etc/nginx/conf.d/10-php.conf | 2 +- .../conf/etc/nginx/vhost.common.d/10-php.conf | 11 ------ .../webdevops-php-nginx/tasks/entrypoint.yml | 1 + docker/php/centos-7-php56/Dockerfile | 6 ++-- docker/php/centos-7-php56/Dockerfile.jinja2 | 22 ++++++------ .../conf/bin/service.d/php-fpm.d/10-init.sh | 1 + .../bin/service.d/php-fpm.d/11-clear-env.sh | 34 +++++++++++++++++++ .../conf/bin/service.d/php-fpm.sh | 7 ++++ .../conf/etc/php/php.webdevops.ini | 3 -- .../conf/etc/supervisor.d/php-fpm.conf | 2 +- .../tasks/bootstrap/php-fpm.pool.yml | 25 ++++++++++++-- template/Dockerfile/images/php5.jinja2 | 2 +- 80 files changed, 450 insertions(+), 147 deletions(-) create mode 100644 docker/php-apache-dev/centos-7-php56/conf/bin/service.d/httpd.d/10-init.sh create mode 100644 docker/php-apache-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh create mode 100644 docker/php-apache-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh create mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-apache/centos-7-php56/conf/bin/service.d/httpd.d/10-init.sh create mode 100644 docker/php-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh create mode 100644 docker/php-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh create mode 100644 docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/nginx.d/10-init.sh create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-nginx/centos-7-php56/conf/bin/service.d/nginx.d/10-init.sh create mode 100644 docker/php/centos-7-php56/conf/bin/service.d/php-fpm.d/10-init.sh create mode 100644 docker/php/centos-7-php56/conf/bin/service.d/php-fpm.d/11-clear-env.sh create mode 100644 docker/php/centos-7-php56/conf/bin/service.d/php-fpm.sh diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile index cab49f090..14437d74f 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -7,12 +7,14 @@ FROM webdevops/php-dev:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=6 -LABEL io.webdevops.version=0.23.0 +LABEL io.webdevops.layout=7 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ @@ -24,7 +26,7 @@ RUN /usr/local/bin/yum-install \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 index 2378eac37..151a772da 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 @@ -2,10 +2,12 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} -{{ apache.centos('php-apache') }} +{{ apache.centos('php-apache php-apache-dev') }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/httpd.d/10-init.sh new file mode 100644 index 000000000..b38dec4fa --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/httpd.d/10-init.sh @@ -0,0 +1,19 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Replace markers +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/httpd.sh b/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/httpd.sh index f9d81f74a..ef5fe16ad 100644 --- a/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/httpd.sh +++ b/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/httpd.sh @@ -1,19 +1,10 @@ #!/usr/bin/env bash set -e +source /opt/docker/bin/config.sh -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi +includeScriptDir "/opt/docker/bin/service.d/httpd.d/" # Apache gets grumpy about PID files pre-existing rm -f /var/run/httpd/httpd.pid -# Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" - exec httpd -DFOREGROUND diff --git a/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/10-php.conf index b017879ad..b91e36bb9 100644 --- a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ - +> ProxySet connectiontimeout=5 timeout=600 - SetHandler "proxy:fcgi://127.0.0.1:9000" + SetHandler "proxy:fcgi://" diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/main.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/main.conf index fb04614ca..12251c222 100644 --- a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/main.conf +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/main.conf @@ -8,3 +8,5 @@ Include /opt/docker/etc/httpd/php.conf IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf Include /opt/docker/etc/httpd/vhost.conf + + diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml index ed97d539c..cd21505a4 100644 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml @@ -1 +1,2 @@ --- + diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 7293c52a3..d0fa4ded5 100644 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index c9e0154b7..abf82d989 100644 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile index 78176176a..cc500e95e 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -7,12 +7,13 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=6 -LABEL io.webdevops.version=0.23.0 +LABEL io.webdevops.layout=7 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/centos-7-php56/Dockerfile.jinja2 b/docker/php-apache/centos-7-php56/Dockerfile.jinja2 index d9ed20444..bbd157465 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-apache/centos-7-php56/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-apache/centos-7-php56/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/centos-7-php56/conf/bin/service.d/httpd.d/10-init.sh new file mode 100644 index 000000000..b38dec4fa --- /dev/null +++ b/docker/php-apache/centos-7-php56/conf/bin/service.d/httpd.d/10-init.sh @@ -0,0 +1,19 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Replace markers +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache/centos-7-php56/conf/bin/service.d/httpd.sh b/docker/php-apache/centos-7-php56/conf/bin/service.d/httpd.sh index f9d81f74a..ef5fe16ad 100644 --- a/docker/php-apache/centos-7-php56/conf/bin/service.d/httpd.sh +++ b/docker/php-apache/centos-7-php56/conf/bin/service.d/httpd.sh @@ -1,19 +1,10 @@ #!/usr/bin/env bash set -e +source /opt/docker/bin/config.sh -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi +includeScriptDir "/opt/docker/bin/service.d/httpd.d/" # Apache gets grumpy about PID files pre-existing rm -f /var/run/httpd/httpd.pid -# Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" - exec httpd -DFOREGROUND diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-php.conf index b017879ad..b91e36bb9 100644 --- a/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-php.conf +++ b/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-php.conf @@ -1,7 +1,7 @@ - +> ProxySet connectiontimeout=5 timeout=600 - SetHandler "proxy:fcgi://127.0.0.1:9000" + SetHandler "proxy:fcgi://" diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/main.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/main.conf index fb04614ca..12251c222 100644 --- a/docker/php-apache/centos-7-php56/conf/etc/httpd/main.conf +++ b/docker/php-apache/centos-7-php56/conf/etc/httpd/main.conf @@ -8,3 +8,5 @@ Include /opt/docker/etc/httpd/php.conf IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf Include /opt/docker/etc/httpd/vhost.conf + + diff --git a/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml b/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml index ed97d539c..cd21505a4 100644 --- a/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml +++ b/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml @@ -1 +1,2 @@ --- + diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index 2b7268fdc..1768a03a1 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=6 -LABEL io.webdevops.version=0.23.0 +LABEL io.webdevops.layout=7 +LABEL io.webdevops.version=0.51.0 COPY conf/ /opt/docker/ @@ -19,3 +19,4 @@ RUN /usr/local/bin/yum-install \ php56w-pecl-xdebug \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh + diff --git a/docker/php-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 4a6eaa050..000000000 --- a/docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,5 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; -} diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 7293c52a3..d0fa4ded5 100644 --- a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index c9e0154b7..abf82d989 100644 --- a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile index 86a58265a..2cf5b8579 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -7,12 +7,14 @@ FROM webdevops/php-dev:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=6 -LABEL io.webdevops.version=0.23.0 +LABEL io.webdevops.layout=7 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 index 3fa3fca14..d144187cc 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 @@ -2,7 +2,9 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a3d69cb39 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/nginx.d/10-init.sh new file mode 100644 index 000000000..656e19f64 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/nginx.d/10-init.sh @@ -0,0 +1,20 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Replace markers +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f1523ee02 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1 @@ +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/nginx.sh b/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/nginx.sh index c4ebf64b5..f5cd26167 100644 --- a/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/nginx.sh +++ b/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/nginx.sh @@ -1,16 +1,7 @@ #!/usr/bin/env bash -set -e -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi +source /opt/docker/bin/config.sh -# Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" +includeScriptDir "/opt/docker/bin/service.d/nginx.d/" exec /usr/sbin/nginx diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf index 8181e24d8..54918ec2b 100644 --- a/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -1,7 +1,10 @@ -FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..a2b27dece --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,4 @@ +location ~* { + expires off; + add_header Cache-Control private; +} diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf index 4a6eaa050..28fd811bc 100644 --- a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -1,5 +1,3 @@ location / { - try_files $uri $uri/ /?$query_string; - expires 0; - add_header Cache-Control private; + try_files $uri $uri/ /?$query_string; } diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx-dev/centos-7-php56/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-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml @@ -0,0 +1,6 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..580d28c3c --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 7293c52a3..d0fa4ded5 100644 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml index c9e0154b7..abf82d989 100644 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -7,3 +7,11 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { key: "access.format", value: '"%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' } + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml index 3e783736c..de7e76c72 100644 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- - include: bootstrap/nginx.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..947bfcfbb --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Open php-fpm for external connections (eg. debuggers) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'listen', value: "0.0.0.0:9000" } diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml index ed97d539c..cd21505a4 100644 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml @@ -1 +1,2 @@ --- + diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index a919c827b..b522fad2b 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -7,12 +7,13 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=6 -LABEL io.webdevops.version=0.23.0 +LABEL io.webdevops.layout=7 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_PHP_SOCKET 127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 b/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 index 60be47c7f..f74b18914 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 @@ -2,7 +2,8 @@ {{ docker.version() }} -{{ docker.environmentWeb() }} +{{ environment.web() }} +{{ environment.webPhp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx/centos-7-php56/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/centos-7-php56/conf/bin/service.d/nginx.d/10-init.sh new file mode 100644 index 000000000..656e19f64 --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/bin/service.d/nginx.d/10-init.sh @@ -0,0 +1,20 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Replace markers +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" + +if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is set + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_PHP_SOCKET" +else + ## WEB_PHP_SOCKET is not set, remove PHP files + rm /opt/docker/etc/nginx/conf.d/10-php.conf + rm /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx/centos-7-php56/conf/bin/service.d/nginx.sh b/docker/php-nginx/centos-7-php56/conf/bin/service.d/nginx.sh index c4ebf64b5..f5cd26167 100644 --- a/docker/php-nginx/centos-7-php56/conf/bin/service.d/nginx.sh +++ b/docker/php-nginx/centos-7-php56/conf/bin/service.d/nginx.sh @@ -1,16 +1,7 @@ #!/usr/bin/env bash -set -e -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi +source /opt/docker/bin/config.sh -# Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" +includeScriptDir "/opt/docker/bin/service.d/nginx.d/" exec /usr/sbin/nginx diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/conf.d/10-php.conf index 4cdbc305f..9abe45f0a 100644 --- a/docker/php-nginx/centos-7-php56/conf/etc/nginx/conf.d/10-php.conf +++ b/docker/php-nginx/centos-7-php56/conf/etc/nginx/conf.d/10-php.conf @@ -1,3 +1,3 @@ upstream php { - server 127.0.0.1:9000; + server ; } diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-php.conf index 1f27f74f6..274beac87 100644 --- a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-php.conf +++ b/docker/php-nginx/centos-7-php56/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-php56/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml b/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml index ed97d539c..cd21505a4 100644 --- a/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml +++ b/docker/php-nginx/centos-7-php56/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml @@ -1 +1,2 @@ --- + diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index 61f0a571b..399fc36ee 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base-app:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=6 -LABEL io.webdevops.version=0.23.0 +LABEL io.webdevops.layout=7 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -55,4 +55,4 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ && /opt/docker/bin/bootstrap.sh -EXPOSE 9000 \ No newline at end of file +EXPOSE 9000 diff --git a/docker/php/centos-7-php56/Dockerfile.jinja2 b/docker/php/centos-7-php56/Dockerfile.jinja2 index 78475a65e..4246d1bb0 100644 --- a/docker/php/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php/centos-7-php56/Dockerfile.jinja2 @@ -1,11 +1,11 @@ -{{ docker.from("base-app", "centos-7") }} - -{{ docker.version() }} - -{{ docker.environmentWeb() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -{{ php5.webtatic() }} - -{{ docker.expose('9000') }} \ No newline at end of file +{{ docker.from("base-app", "centos-7") }} + +{{ docker.version() }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ php5.centosWebtatic() }} + +{{ docker.expose('9000') }} diff --git a/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..b17280ce6 --- /dev/null +++ b/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,34 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet ";#CLEAR_ENV_WORKAROUND#" "$VARIABLE_LIST" > /dev/null + diff --git a/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.sh b/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.sh new file mode 100644 index 000000000..571f248d2 --- /dev/null +++ b/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" + +exec /usr/sbin/php-fpm --nodaemonize diff --git a/docker/php/centos-7-php56/conf/etc/php/php.webdevops.ini b/docker/php/centos-7-php56/conf/etc/php/php.webdevops.ini index b95068e9c..562b8d7e2 100644 --- a/docker/php/centos-7-php56/conf/etc/php/php.webdevops.ini +++ b/docker/php/centos-7-php56/conf/etc/php/php.webdevops.ini @@ -27,10 +27,7 @@ date.timezone = UTC mysql.default_host = mysql mysqli.default_host = mysql - opcache.memory_consumption = 256 -opcache.revalidate_freq = 0 -opcache.validate_timestamps = 0 opcache.interned_strings_buffer = 16 opcache.max_accelerated_files = 7963 opcache.fast_shutdown = 1 diff --git a/docker/php/centos-7-php56/conf/etc/supervisor.d/php-fpm.conf b/docker/php/centos-7-php56/conf/etc/supervisor.d/php-fpm.conf index 33e894d11..f40531bbc 100644 --- a/docker/php/centos-7-php56/conf/etc/supervisor.d/php-fpm.conf +++ b/docker/php/centos-7-php56/conf/etc/supervisor.d/php-fpm.conf @@ -3,7 +3,7 @@ programs=php-fpmd,php-fpm-log-fpm,php-fpm-log-slow,php-fpm-log-error,php-fpm-log priority=20 [program:php-fpmd] -command = /usr/sbin/php-fpm --nodaemonize +command = /opt/docker/bin/service.d/php-fpm.sh process_name=%(program_name)s startsecs = 0 autostart = true diff --git a/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index c64a89e93..da665ebf5 100644 --- a/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -13,6 +13,15 @@ - debug: msg: "PHP-Version: {{php_version}}" +- set_fact: + php_clear_env_available: False + +- set_fact: + php_clear_env_available: True + when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or + ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or + ( php_version | version_compare('5.6', 'ge') ) + - name: Set php pool file set_fact: php_pool_conf: www.conf @@ -76,10 +85,19 @@ line: '{{ item.key }} = {{ item.value }}' with_items: - { key: 'clear_env', value: "no" } - when: ( php_version | version_compare('5.4', 'eq') and php_version | version_compare('5.4.27', 'ge') ) or - ( php_version | version_compare('5.5', 'eq') and php_version | version_compare('5.5.11', 'ge') ) or - ( php_version | version_compare('5.6', 'ge') ) + when: php_clear_env_available == True +- name: Remove clear env workaround + file: + path: "/opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh" + state: absent + when: php_clear_env_available == True + +- name: Append clear env workaround in php-fpm pool (old php-fpm versions) + lineinfile: + dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' + line: ';#CLEAR_ENV_WORKAROUND#' + when: php_clear_env_available == False - name: Disable php-fpm connection limit lineinfile: @@ -88,3 +106,4 @@ line: ';{{ item.key }}' with_items: - { key: 'listen.allowed_clients' } + diff --git a/template/Dockerfile/images/php5.jinja2 b/template/Dockerfile/images/php5.jinja2 index 9dc9f24b0..6860782ff 100644 --- a/template/Dockerfile/images/php5.jinja2 +++ b/template/Dockerfile/images/php5.jinja2 @@ -101,7 +101,7 @@ RUN /usr/local/bin/yum-install \ {{ provision.runRoleInline('php', role) }} {%- endmacro %} -{% macro webtatic(role='') -%} +{% macro centosWebtatic(role='') -%} RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ && /usr/local/bin/yum-install \ # Install tools From 9b6110fc74038c6c9cb6d3abfd5671a3034c9bef Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Thu, 16 Jun 2016 23:05:30 +0200 Subject: [PATCH 03/15] Disable redis for centos-7-php56 Redis wants PHP 7 but only 5.6 is available. Needs to be fixed --- docker/php/centos-7-php56/Dockerfile | 2 +- template/Dockerfile/images/php5.jinja2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index 399fc36ee..0b4f324ba 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -49,7 +49,7 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ && pear upgrade-all \ && pear config-set auto_discover 1 \ && pecl install imagick \ - && pecl install redis \ + # && pecl install redis \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh diff --git a/template/Dockerfile/images/php5.jinja2 b/template/Dockerfile/images/php5.jinja2 index 6860782ff..eab1b5bb4 100644 --- a/template/Dockerfile/images/php5.jinja2 +++ b/template/Dockerfile/images/php5.jinja2 @@ -135,7 +135,7 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ && pear upgrade-all \ && pear config-set auto_discover 1 \ && pecl install imagick \ - && pecl install redis \ + # && pecl install redis \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ {{ provision.runRoleInline('php', role) }} {%- endmacro %} From 05eab0cd1ffe2431947a22f3628e2528b9d89f52 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sun, 19 Jun 2016 15:44:44 +0200 Subject: [PATCH 04/15] Switch to postfix env variables Add POSTFIX_MYNETWORKS and POSTFIX_RELAYHOST --- .../alpine-3/conf/bin/service.d/postfix.d/10-init.sh | 8 ++++++++ .../centos-7/conf/bin/service.d/postfix.d/10-init.sh | 8 ++++++++ .../debian-7/conf/bin/service.d/postfix.d/10-init.sh | 8 ++++++++ .../debian-8/conf/bin/service.d/postfix.d/10-init.sh | 8 ++++++++ .../debian-9/conf/bin/service.d/postfix.d/10-init.sh | 8 ++++++++ .../ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh | 8 ++++++++ .../ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh | 8 ++++++++ .../ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh | 8 ++++++++ .../ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh | 8 ++++++++ .../ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh | 8 ++++++++ .../provision/roles/webdevops-postfix/defaults/main.yml | 6 ------ .../roles/webdevops-postfix/tasks/entrypoint.yml | 9 --------- .../provision/roles/webdevops-postfix/tasks/main.yml | 4 ---- .../latest/conf/bin/service.d/postfix.d/10-init.sh | 8 ++++++++ .../docs/content/DockerImages/dockerfiles/base-app.rst | 5 +++++ .../content/DockerImages/dockerfiles/hhvm-apache.rst | 1 + .../docs/content/DockerImages/dockerfiles/hhvm-nginx.rst | 1 + .../docs/content/DockerImages/dockerfiles/hhvm.rst | 5 +++++ .../dockerfiles/include/environment-base-app.rst | 6 ++++++ .../content/DockerImages/dockerfiles/mail-catcher.rst | 2 +- .../content/DockerImages/dockerfiles/php-apache-dev.rst | 1 + .../docs/content/DockerImages/dockerfiles/php-apache.rst | 1 + .../docs/content/DockerImages/dockerfiles/php-dev.rst | 5 +++++ .../content/DockerImages/dockerfiles/php-nginx-dev.rst | 1 + .../docs/content/DockerImages/dockerfiles/php-nginx.rst | 1 + .../docs/content/DockerImages/dockerfiles/php.rst | 4 ++++ .../docs/content/DockerImages/dockerfiles/postfix.rst | 7 +------ .../DockerImages/dockerfiles/samson-deployment.rst | 2 +- .../base-app/general/bin/service.d/postfix.d/10-init.sh | 8 ++++++++ .../provision/roles/webdevops-postfix/defaults/main.yml | 6 ------ .../roles/webdevops-postfix/tasks/entrypoint.yml | 9 --------- .../provision/roles/webdevops-postfix/tasks/main.yml | 4 ---- 32 files changed, 130 insertions(+), 46 deletions(-) delete mode 100644 docker/postfix/latest/conf/provision/roles/webdevops-postfix/tasks/entrypoint.yml create mode 100644 documentation/docs/content/DockerImages/dockerfiles/include/environment-base-app.rst delete mode 100644 provisioning/postfix/general/provision/roles/webdevops-postfix/tasks/entrypoint.yml diff --git a/docker/base-app/alpine-3/conf/bin/service.d/postfix.d/10-init.sh b/docker/base-app/alpine-3/conf/bin/service.d/postfix.d/10-init.sh index e1e429811..923002f39 100644 --- a/docker/base-app/alpine-3/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base-app/alpine-3/conf/bin/service.d/postfix.d/10-init.sh @@ -3,3 +3,11 @@ mkdir -p /var/spool/postfix/etc cp -f /etc/hosts /var/spool/postfix/etc/hosts cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf cp -f /etc/services /var/spool/postfix/etc/services + +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; else + echo "relayhost = $POSTFIX_RELAYHOST" >> /etc/postfix/main.cf +fi + +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; else + echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf +fi diff --git a/docker/base-app/centos-7/conf/bin/service.d/postfix.d/10-init.sh b/docker/base-app/centos-7/conf/bin/service.d/postfix.d/10-init.sh index e1e429811..923002f39 100644 --- a/docker/base-app/centos-7/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base-app/centos-7/conf/bin/service.d/postfix.d/10-init.sh @@ -3,3 +3,11 @@ mkdir -p /var/spool/postfix/etc cp -f /etc/hosts /var/spool/postfix/etc/hosts cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf cp -f /etc/services /var/spool/postfix/etc/services + +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; else + echo "relayhost = $POSTFIX_RELAYHOST" >> /etc/postfix/main.cf +fi + +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; else + echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf +fi diff --git a/docker/base-app/debian-7/conf/bin/service.d/postfix.d/10-init.sh b/docker/base-app/debian-7/conf/bin/service.d/postfix.d/10-init.sh index e1e429811..923002f39 100644 --- a/docker/base-app/debian-7/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base-app/debian-7/conf/bin/service.d/postfix.d/10-init.sh @@ -3,3 +3,11 @@ mkdir -p /var/spool/postfix/etc cp -f /etc/hosts /var/spool/postfix/etc/hosts cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf cp -f /etc/services /var/spool/postfix/etc/services + +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; else + echo "relayhost = $POSTFIX_RELAYHOST" >> /etc/postfix/main.cf +fi + +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; else + echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf +fi diff --git a/docker/base-app/debian-8/conf/bin/service.d/postfix.d/10-init.sh b/docker/base-app/debian-8/conf/bin/service.d/postfix.d/10-init.sh index e1e429811..923002f39 100644 --- a/docker/base-app/debian-8/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base-app/debian-8/conf/bin/service.d/postfix.d/10-init.sh @@ -3,3 +3,11 @@ mkdir -p /var/spool/postfix/etc cp -f /etc/hosts /var/spool/postfix/etc/hosts cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf cp -f /etc/services /var/spool/postfix/etc/services + +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; else + echo "relayhost = $POSTFIX_RELAYHOST" >> /etc/postfix/main.cf +fi + +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; else + echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf +fi diff --git a/docker/base-app/debian-9/conf/bin/service.d/postfix.d/10-init.sh b/docker/base-app/debian-9/conf/bin/service.d/postfix.d/10-init.sh index e1e429811..923002f39 100644 --- a/docker/base-app/debian-9/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base-app/debian-9/conf/bin/service.d/postfix.d/10-init.sh @@ -3,3 +3,11 @@ mkdir -p /var/spool/postfix/etc cp -f /etc/hosts /var/spool/postfix/etc/hosts cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf cp -f /etc/services /var/spool/postfix/etc/services + +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; else + echo "relayhost = $POSTFIX_RELAYHOST" >> /etc/postfix/main.cf +fi + +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; else + echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf +fi diff --git a/docker/base-app/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base-app/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh index e1e429811..923002f39 100644 --- a/docker/base-app/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base-app/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh @@ -3,3 +3,11 @@ mkdir -p /var/spool/postfix/etc cp -f /etc/hosts /var/spool/postfix/etc/hosts cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf cp -f /etc/services /var/spool/postfix/etc/services + +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; else + echo "relayhost = $POSTFIX_RELAYHOST" >> /etc/postfix/main.cf +fi + +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; else + echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf +fi diff --git a/docker/base-app/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base-app/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh index e1e429811..923002f39 100644 --- a/docker/base-app/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base-app/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh @@ -3,3 +3,11 @@ mkdir -p /var/spool/postfix/etc cp -f /etc/hosts /var/spool/postfix/etc/hosts cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf cp -f /etc/services /var/spool/postfix/etc/services + +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; else + echo "relayhost = $POSTFIX_RELAYHOST" >> /etc/postfix/main.cf +fi + +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; else + echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf +fi diff --git a/docker/base-app/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base-app/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh index e1e429811..923002f39 100644 --- a/docker/base-app/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base-app/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh @@ -3,3 +3,11 @@ mkdir -p /var/spool/postfix/etc cp -f /etc/hosts /var/spool/postfix/etc/hosts cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf cp -f /etc/services /var/spool/postfix/etc/services + +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; else + echo "relayhost = $POSTFIX_RELAYHOST" >> /etc/postfix/main.cf +fi + +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; else + echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf +fi diff --git a/docker/base-app/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh b/docker/base-app/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh index e1e429811..923002f39 100644 --- a/docker/base-app/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base-app/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh @@ -3,3 +3,11 @@ mkdir -p /var/spool/postfix/etc cp -f /etc/hosts /var/spool/postfix/etc/hosts cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf cp -f /etc/services /var/spool/postfix/etc/services + +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; else + echo "relayhost = $POSTFIX_RELAYHOST" >> /etc/postfix/main.cf +fi + +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; else + echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf +fi diff --git a/docker/base-app/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base-app/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh index e1e429811..923002f39 100644 --- a/docker/base-app/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base-app/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh @@ -3,3 +3,11 @@ mkdir -p /var/spool/postfix/etc cp -f /etc/hosts /var/spool/postfix/etc/hosts cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf cp -f /etc/services /var/spool/postfix/etc/services + +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; else + echo "relayhost = $POSTFIX_RELAYHOST" >> /etc/postfix/main.cf +fi + +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; else + echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf +fi diff --git a/docker/postfix/latest/conf/provision/roles/webdevops-postfix/defaults/main.yml b/docker/postfix/latest/conf/provision/roles/webdevops-postfix/defaults/main.yml index 9f5e1b5fb..cd21505a4 100644 --- a/docker/postfix/latest/conf/provision/roles/webdevops-postfix/defaults/main.yml +++ b/docker/postfix/latest/conf/provision/roles/webdevops-postfix/defaults/main.yml @@ -1,8 +1,2 @@ --- -POSTFIX_VARS: - - variable: mynetworks - value: "{{ lookup('env','POSTFIX_MYNETWORKS') }}" - - - variable: relayhost - value: "{{ lookup('env','POSTFIX_RELAYHOST') }}" diff --git a/docker/postfix/latest/conf/provision/roles/webdevops-postfix/tasks/entrypoint.yml b/docker/postfix/latest/conf/provision/roles/webdevops-postfix/tasks/entrypoint.yml deleted file mode 100644 index 60f93f9c2..000000000 --- a/docker/postfix/latest/conf/provision/roles/webdevops-postfix/tasks/entrypoint.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Configure postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s;]*{{ item.variable }}[\s]*=' - line: '{{ item.variable }} = {{ item.value }}' - with_items: "{{ POSTFIX_VARS }}" - when: item.value != "" \ No newline at end of file diff --git a/docker/postfix/latest/conf/provision/roles/webdevops-postfix/tasks/main.yml b/docker/postfix/latest/conf/provision/roles/webdevops-postfix/tasks/main.yml index 7895a52a9..1806c1a8c 100644 --- a/docker/postfix/latest/conf/provision/roles/webdevops-postfix/tasks/main.yml +++ b/docker/postfix/latest/conf/provision/roles/webdevops-postfix/tasks/main.yml @@ -3,7 +3,3 @@ - include: bootstrap.yml tags: - bootstrap - -- include: entrypoint.yml - tags: - - entrypoint diff --git a/docker/samson-deployment/latest/conf/bin/service.d/postfix.d/10-init.sh b/docker/samson-deployment/latest/conf/bin/service.d/postfix.d/10-init.sh index e1e429811..923002f39 100644 --- a/docker/samson-deployment/latest/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/samson-deployment/latest/conf/bin/service.d/postfix.d/10-init.sh @@ -3,3 +3,11 @@ mkdir -p /var/spool/postfix/etc cp -f /etc/hosts /var/spool/postfix/etc/hosts cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf cp -f /etc/services /var/spool/postfix/etc/services + +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; else + echo "relayhost = $POSTFIX_RELAYHOST" >> /etc/postfix/main.cf +fi + +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; else + echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf +fi diff --git a/documentation/docs/content/DockerImages/dockerfiles/base-app.rst b/documentation/docs/content/DockerImages/dockerfiles/base-app.rst index eabf837f9..595de21a5 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/base-app.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/base-app.rst @@ -27,3 +27,8 @@ this image. For an example docker service .. attention:: Alpine doesn't provide any locales so you have to find another method for using locales! + +Environment variables +--------------------- + +.. include:: include/environment-base-app.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/hhvm-apache.rst b/documentation/docs/content/DockerImages/dockerfiles/hhvm-apache.rst index 65d2f70ff..cf71790fe 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/hhvm-apache.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/hhvm-apache.rst @@ -14,6 +14,7 @@ Docker image tags Environment variables --------------------- +.. include:: include/environment-base-app.rst .. include:: include/environment-web.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/hhvm-nginx.rst b/documentation/docs/content/DockerImages/dockerfiles/hhvm-nginx.rst index 0d2aba8b2..9d77d67ff 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/hhvm-nginx.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/hhvm-nginx.rst @@ -14,6 +14,7 @@ Docker image tags Environment variables --------------------- +.. include:: include/environment-base-app.rst .. include:: include/environment-web.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/hhvm.rst b/documentation/docs/content/DockerImages/dockerfiles/hhvm.rst index ce6941f69..d87c2f055 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/hhvm.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/hhvm.rst @@ -11,6 +11,11 @@ Docker image tags .. include:: include/image-tag-hhvm.rst +Environment variables +--------------------- + +.. include:: include/environment-base-app.rst + Docker image layout ------------------- diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/environment-base-app.rst b/documentation/docs/content/DockerImages/dockerfiles/include/environment-base-app.rst new file mode 100644 index 000000000..0deb1355b --- /dev/null +++ b/documentation/docs/content/DockerImages/dockerfiles/include/environment-base-app.rst @@ -0,0 +1,6 @@ +====================== ============================= ============= +Environment variable Description Default +====================== ============================= ============= +``POSTFIX_MYNETWORKS`` Postfix mynetworks address *empty* +``POSTFIX_RELAYHOST`` Postfix upstream relay server *empty* +====================== ============================= ============= diff --git a/documentation/docs/content/DockerImages/dockerfiles/mail-catcher.rst b/documentation/docs/content/DockerImages/dockerfiles/mail-catcher.rst index 4750832ed..b3113dc2d 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/mail-catcher.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/mail-catcher.rst @@ -14,7 +14,7 @@ Docker image tags Environment variables --------------------- - +.. include:: include/environment-base-app.rst Docker image layout diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst index 2d6246b08..b1a9e5edf 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst @@ -16,6 +16,7 @@ Docker image tags Environment variables --------------------- +.. include:: include/environment-base-app.rst .. include:: include/environment-web-dev.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst b/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst index 28f40a11a..daaa3da01 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst @@ -14,6 +14,7 @@ Docker image tags Environment variables --------------------- +.. include:: include/environment-base-app.rst .. include:: include/environment-web.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst index bb75f291c..90f9b98b4 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst @@ -12,6 +12,11 @@ Docker image tags .. include:: include/image-tag-php.rst +Environment variables +--------------------- + +.. include:: include/environment-base-app.rst + Docker image layout ------------------- diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst index dc0d64085..d1b9a17da 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst @@ -16,6 +16,7 @@ Docker image tags Environment variables --------------------- +.. include:: include/environment-base-app.rst .. include:: include/environment-web-dev.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst b/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst index e6ad35069..ec55f98b0 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst @@ -14,6 +14,7 @@ Docker image tags Environment variables --------------------- +.. include:: include/environment-base-app.rst .. include:: include/environment-web.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/php.rst b/documentation/docs/content/DockerImages/dockerfiles/php.rst index ecdde587c..709f253d6 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php.rst @@ -10,6 +10,10 @@ Docker image tags .. include:: include/image-tag-php.rst +Environment variables +--------------------- + +.. include:: include/environment-base-app.rst Docker image layout ------------------- diff --git a/documentation/docs/content/DockerImages/dockerfiles/postfix.rst b/documentation/docs/content/DockerImages/dockerfiles/postfix.rst index ab90cc4f5..5dff6e327 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/postfix.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/postfix.rst @@ -7,10 +7,5 @@ These image extends ``webdevops/base`` with a postfix daemon which is running on Environment variables --------------------- -====================== ============================= ============= -Environment variable Description Default -====================== ============================= ============= -``POSTFIX_MYNETWORKS`` Postfix mynetworks address *empty* -``POSTFIX_RELAYHOST`` Postfix upstream relay server *empty* -====================== ============================= ============= +.. include:: include/environment-base-app.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/samson-deployment.rst b/documentation/docs/content/DockerImages/dockerfiles/samson-deployment.rst index 79e98a407..d977f4824 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/samson-deployment.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/samson-deployment.rst @@ -21,7 +21,7 @@ The original image is only the webbased deployment system and is extended by: Environment variables --------------------- - +.. include:: include/environment-base-app.rst Docker image layout diff --git a/provisioning/base-app/general/bin/service.d/postfix.d/10-init.sh b/provisioning/base-app/general/bin/service.d/postfix.d/10-init.sh index e1e429811..923002f39 100644 --- a/provisioning/base-app/general/bin/service.d/postfix.d/10-init.sh +++ b/provisioning/base-app/general/bin/service.d/postfix.d/10-init.sh @@ -3,3 +3,11 @@ mkdir -p /var/spool/postfix/etc cp -f /etc/hosts /var/spool/postfix/etc/hosts cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf cp -f /etc/services /var/spool/postfix/etc/services + +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; else + echo "relayhost = $POSTFIX_RELAYHOST" >> /etc/postfix/main.cf +fi + +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; else + echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf +fi diff --git a/provisioning/postfix/general/provision/roles/webdevops-postfix/defaults/main.yml b/provisioning/postfix/general/provision/roles/webdevops-postfix/defaults/main.yml index 9f5e1b5fb..cd21505a4 100644 --- a/provisioning/postfix/general/provision/roles/webdevops-postfix/defaults/main.yml +++ b/provisioning/postfix/general/provision/roles/webdevops-postfix/defaults/main.yml @@ -1,8 +1,2 @@ --- -POSTFIX_VARS: - - variable: mynetworks - value: "{{ lookup('env','POSTFIX_MYNETWORKS') }}" - - - variable: relayhost - value: "{{ lookup('env','POSTFIX_RELAYHOST') }}" diff --git a/provisioning/postfix/general/provision/roles/webdevops-postfix/tasks/entrypoint.yml b/provisioning/postfix/general/provision/roles/webdevops-postfix/tasks/entrypoint.yml deleted file mode 100644 index 60f93f9c2..000000000 --- a/provisioning/postfix/general/provision/roles/webdevops-postfix/tasks/entrypoint.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Configure postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s;]*{{ item.variable }}[\s]*=' - line: '{{ item.variable }} = {{ item.value }}' - with_items: "{{ POSTFIX_VARS }}" - when: item.value != "" \ No newline at end of file diff --git a/provisioning/postfix/general/provision/roles/webdevops-postfix/tasks/main.yml b/provisioning/postfix/general/provision/roles/webdevops-postfix/tasks/main.yml index 7895a52a9..1806c1a8c 100644 --- a/provisioning/postfix/general/provision/roles/webdevops-postfix/tasks/main.yml +++ b/provisioning/postfix/general/provision/roles/webdevops-postfix/tasks/main.yml @@ -3,7 +3,3 @@ - include: bootstrap.yml tags: - bootstrap - -- include: entrypoint.yml - tags: - - entrypoint From 7c5af2fff6f4c006d7b845568b13da4797ee1686 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sun, 19 Jun 2016 15:46:25 +0200 Subject: [PATCH 05/15] Add pysed For more advanced search&replace tasks (secure alternative for sed) --- docker/bootstrap/alpine-3/Dockerfile | 2 +- docker/bootstrap/centos-7/Dockerfile | 9 +++++++-- 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 | 3 ++- docker/bootstrap/ubuntu-15.04/Dockerfile | 3 ++- docker/bootstrap/ubuntu-15.10/Dockerfile | 3 ++- docker/bootstrap/ubuntu-16.04/Dockerfile | 3 ++- docker/samson-deployment/latest/Dockerfile | 2 +- template/Dockerfile/images/bootstrap.jinja2 | 18 ++++++++++++------ test/spec/shared/bootstrap/toolchain.rb | 7 +++++++ 13 files changed, 40 insertions(+), 18 deletions(-) diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index 2140681e5..a653284d1 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine-3/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ py-paramiko \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible \ + && pip install ansible pysed \ && chmod 750 /usr/bin/ansible* \ # Cleanup && apk del python-dev diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index b16a04587..06b733c88 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -32,8 +32,13 @@ RUN set -x \ python-paramiko \ python-setuptools \ python-setuptools-devel \ + libffi \ + python-devel \ + libffi-devel \ && easy_install pip \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible \ - && chmod 750 /usr/bin/ansible* + && pip install ansible pysed \ + && chmod 750 /usr/bin/ansible* \ + && yum erase -y python-devel \ + && yum clean all diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index fa07b3ce7..aaa0d3fe2 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -47,7 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible \ + && pip install ansible pysed \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 520d46f4b..ddc5c16ef 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -47,7 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible \ + && pip install ansible pysed \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index dde4cd1e2..a37d8500e 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -47,7 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible \ + && pip install ansible pysed \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index e5ded4868..b7d43bc4c 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -48,7 +48,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ apt-transport-https \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible \ + && pip install ansible pysed \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 21c1ef4f1..b1d8eab72 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -39,13 +39,14 @@ RUN export DEBIAN_FRONTEND=noninteractive \ python-pip \ python-paramiko \ python-jinja2 \ + python-cffi \ python-dev \ libffi-dev \ libssl-dev \ build-essential \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible \ + && pip install ansible pysed \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 0894c317e..b1ae6d6de 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -39,13 +39,14 @@ RUN export DEBIAN_FRONTEND=noninteractive \ python-pip \ python-paramiko \ python-jinja2 \ + python-cffi \ python-dev \ libffi-dev \ libssl-dev \ build-essential \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible \ + && pip install ansible pysed \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 155ccbbd6..64c174977 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -39,13 +39,14 @@ RUN export DEBIAN_FRONTEND=noninteractive \ python-pip \ python-paramiko \ python-jinja2 \ + python-cffi \ python-dev \ libffi-dev \ libssl-dev \ build-essential \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible \ + && pip install ansible pysed \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 7695419f5..417f270d7 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -39,13 +39,14 @@ RUN export DEBIAN_FRONTEND=noninteractive \ python-pip \ python-paramiko \ python-jinja2 \ + python-cffi \ python-dev \ libffi-dev \ libssl-dev \ build-essential \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible \ + && pip install ansible pysed \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 1c68c7eee..65680f32e 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -52,7 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible \ + && pip install ansible pysed \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ diff --git a/template/Dockerfile/images/bootstrap.jinja2 b/template/Dockerfile/images/bootstrap.jinja2 index 6d1b610e7..8867f96e8 100644 --- a/template/Dockerfile/images/bootstrap.jinja2 +++ b/template/Dockerfile/images/bootstrap.jinja2 @@ -28,7 +28,7 @@ RUN set -x \ py-paramiko \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible \ + && pip install ansible pysed \ && chmod 750 /usr/bin/ansible* \ # Cleanup && apk del python-dev @@ -53,11 +53,16 @@ RUN set -x \ python-paramiko \ python-setuptools \ python-setuptools-devel \ + libffi \ + python-devel \ + libffi-devel \ && easy_install pip \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible \ - && chmod 750 /usr/bin/ansible* + && pip install ansible pysed \ + && chmod 750 /usr/bin/ansible* \ + && yum erase -y python-devel \ + && yum clean all {%- endmacro %} @@ -93,7 +98,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible \ + && pip install ansible pysed \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ @@ -139,7 +144,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ apt-transport-https \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible \ + && pip install ansible pysed \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ @@ -176,13 +181,14 @@ RUN export DEBIAN_FRONTEND=noninteractive \ python-pip \ python-paramiko \ python-jinja2 \ + python-cffi \ python-dev \ libffi-dev \ libssl-dev \ build-essential \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible \ + && pip install ansible pysed \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ diff --git a/test/spec/shared/bootstrap/toolchain.rb b/test/spec/shared/bootstrap/toolchain.rb index ee6632479..c9c28eeaa 100644 --- a/test/spec/shared/bootstrap/toolchain.rb +++ b/test/spec/shared/bootstrap/toolchain.rb @@ -16,4 +16,11 @@ its(:exit_status) { should eq 0 } end + describe command('pysed --version') do + its(:exit_status) { should eq 0 } + end + + describe command('rpl --version') do + its(:exit_status) { should eq 0 } + end end From 80ed01a0948af908e2a87cda0a0711997da7ac4c Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sun, 19 Jun 2016 16:43:51 +0200 Subject: [PATCH 06/15] Add switchable php debugger Available with env variable PHP_DEBUGGER - none (no debugger loaded) - xdebug (default) - blackfire --- .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ .../include/environment-web-dev.rst | 2 + .../DockerImages/dockerfiles/php-dev.rst | 1 + .../docs/content/DockerImages/index.rst | 46 +++++++------- .../provision/entrypoint.d/10-php-debugger.sh | 61 +++++++++++++++++++ 43 files changed, 2466 insertions(+), 23 deletions(-) create mode 100644 docker/php-apache-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-apache-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-apache-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-nginx-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/environment-web-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/include/environment-web-dev.rst index 36773e2df..267ca9ffe 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/include/environment-web-dev.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/include/environment-web-dev.rst @@ -8,4 +8,6 @@ Environment variable Description Default ``WEB_NO_CACHE_PATTERN`` RegExp of files which should ``\.(css|js|gif|png|jpg|svg|json|xml)$`` be delivered by webserver as non cacheable to browser +``PHP_DEBUGGER`` Specifies which php debugger *empty* (eg. ``xdebug``, ``blackfire`` or + should be active ``none``) ========================== ============================ ============================================== diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst index 90f9b98b4..e02b2cb5e 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst @@ -16,6 +16,7 @@ Environment variables --------------------- .. include:: include/environment-base-app.rst +.. include:: include/environment-web-dev.rst Docker image layout diff --git a/documentation/docs/content/DockerImages/index.rst b/documentation/docs/content/DockerImages/index.rst index 5028b507d..924ce9311 100644 --- a/documentation/docs/content/DockerImages/index.rst +++ b/documentation/docs/content/DockerImages/index.rst @@ -12,26 +12,26 @@ Docker images .. toctree:: :maxdepth: 1 - dockerfiles/ansible - dockerfiles/apache - dockerfiles/base - dockerfiles/base-app - dockerfiles/bootstrap - dockerfiles/hhvm - dockerfiles/hhvm-apache - dockerfiles/hhvm-nginx - dockerfiles/mail-catcher - dockerfiles/nginx - dockerfiles/php - dockerfiles/php-apache - dockerfiles/php-apache-dev - dockerfiles/php-dev - dockerfiles/php-nginx - dockerfiles/php-nginx-dev - dockerfiles/postfix - dockerfiles/samson-deployment - dockerfiles/sphinx - dockerfiles/ssh - dockerfiles/storage - dockerfiles/varnish - dockerfiles/vsftp + dockerfiles/ansible + dockerfiles/apache + dockerfiles/base + dockerfiles/base-app + dockerfiles/bootstrap + dockerfiles/hhvm + dockerfiles/hhvm-apache + dockerfiles/hhvm-nginx + dockerfiles/mail-catcher + dockerfiles/nginx + dockerfiles/php + dockerfiles/php-apache + dockerfiles/php-apache-dev + dockerfiles/php-dev + dockerfiles/php-nginx + dockerfiles/php-nginx-dev + dockerfiles/postfix + dockerfiles/samson-deployment + dockerfiles/sphinx + dockerfiles/ssh + dockerfiles/storage + dockerfiles/varnish + dockerfiles/vsftp diff --git a/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh b/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..f29d015ff --- /dev/null +++ b/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,61 @@ +# +# Debugger switch +# + +function phpModuleEnable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write + fi + done +} + +function phpModuleDisable() { + for PHP_FILE in $*; do + if [[ -f "$PHP_FILE" ]]; then + pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write + fi + done +} + +PHP_XDEBUG_FILES=" +/etc/php.d/xdebug.ini +/etc/php5/mods-available/xdebug.ini +/etc/php5/cli/conf.d/20-xdebug.ini +/etc/php5/cli/conf.d/xdebug.ini +/etc/php5/fpm/conf.d/20-xdebug.ini +/etc/php5/fpm/conf.d/xdebug.ini +/etc/php/7.0/mods-available/xdebug.ini +/etc/php/7.0/cli/conf.d/20-xdebug.ini +/etc/php/7.0/fpm/conf.d/20-xdebug.ini" + +PHP_BLACKFIRE_FILES=" +/etc/php.d/zz-blackfire.ini +/etc/php5/conf.d/90-blackfire.ini +/etc/php5/conf.d/zz-blackfire.ini +/etc/php5/cli/conf.d/90-blackfire.ini +/etc/php5/cli/conf.d/zz-blackfire.ini +/etc/php5/fpm/conf.d/90-blackfire.ini +/etc/php5/fpm/conf.d/zz-blackfire.ini +/etc/php/7.0/cli/conf.d/90-blackfire.ini +/etc/php/7.0/fpm/conf.d/90-blackfire.ini" + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleEnable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + + none) + echo "PHP-Debugger: none" + phpModuleDisable $PHP_BLACKFIRE_FILES + phpModuleDisable $PHP_XDEBUG_FILES + ;; + esac +fi From d776480eaf73b41f8c7dea43944a707c6fff7c1c Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sun, 19 Jun 2016 22:08:36 +0200 Subject: [PATCH 07/15] Refactor tests with environment variables Used environment variables instead of distribution settings --- test/run.sh | 47 ++++++++++++++++++++++++-- test/spec/shared/php/modules.rb | 60 ++++++++++++++++----------------- test/spec/spec_helper.rb | 15 +++++++++ 3 files changed, 89 insertions(+), 33 deletions(-) diff --git a/test/run.sh b/test/run.sh index 131d40d1a..91c2280ac 100755 --- a/test/run.sh +++ b/test/run.sh @@ -92,6 +92,8 @@ function runTestForTag() { docker pull "$DOCKER_IMAGE_WITH_TAG" fi + setupDockerTagEnvironment "$DOCKER_TAG" + DOCKERFILE="Dockerfile.${DOCKER_IMAGE//\//-}-${DOCKER_TAG}.test" ## Build Dockerfile @@ -190,6 +192,45 @@ function printRepeatedChar() { echo } +### + # Switch environment variables for test + # + # $1 -> Docker tag + # + ## +function setupDockerTagEnvironment() { + unset PHP_REDIS + unset PHP_APCU + unset PHP_XDEBUG + unset PHP_MHASH + + case "$1" in + ubuntu-12.04) + export PHP_REDIS=0 + export PHP_APCU=0 + ;; + + debian-7) + export PHP_REDIS=0 + export PHP_APCU=0 + ;; + + debian-8-php7) + export PHP_XDEBUG=0 + ;; + + centos-7-php56) + export PHP_APCU=0 + export PHP_REDIS=0 + ;; + + alpine-3) + export PHP_REDIS=0 + export PHP_MHASH=0 + ;; + esac +} + initEnvironment ####################################### @@ -397,7 +438,7 @@ initEnvironment OS_VERSION="$DOCKER_TAG_LATEST" runTestForTag "latest" setEnvironmentOsFamily "debian" - PHP_XDEBUG=0 OS_VERSION="8" runTestForTag "debian-8-php7" + OS_VERSION="8" runTestForTag "debian-8-php7" OS_VERSION="testing" runTestForTag "debian-9" setEnvironmentOsFamily "alpine" @@ -555,7 +596,7 @@ initEnvironment OS_VERSION="$DOCKER_TAG_LATEST" runTestForTag "latest" setEnvironmentOsFamily "debian" - PHP_XDEBUG=0 OS_VERSION="8" runTestForTag "debian-8-php7" + OS_VERSION="8" runTestForTag "debian-8-php7" OS_VERSION="testing" runTestForTag "debian-9" setEnvironmentOsFamily "alpine" @@ -657,7 +698,7 @@ initEnvironment OS_VERSION="$DOCKER_TAG_LATEST" runTestForTag "latest" setEnvironmentOsFamily "debian" - PHP_XDEBUG=0 OS_VERSION="8" runTestForTag "debian-8-php7" + OS_VERSION="8" runTestForTag "debian-8-php7" OS_VERSION="testing" runTestForTag "debian-9" setEnvironmentOsFamily "alpine" diff --git a/test/spec/shared/php/modules.rb b/test/spec/shared/php/modules.rb index d7bbfbc78..9859dde30 100644 --- a/test/spec/shared/php/modules.rb +++ b/test/spec/shared/php/modules.rb @@ -53,16 +53,12 @@ its(:stdout) { should contain('xsl') } its(:stdout) { should contain('zip') } its(:stdout) { should contain('zlib') } + its(:stdout) { should contain('gd') } - if ( os[:family] != 'alpine' ) - its(:stdout) { should contain('gd') } - end - - if !( - (os[:family] == 'ubuntu' and os[:version] == '12.04' ) or - (os[:family] == 'debian' and os[:version] == '7' ) - ) + if ( $testConfiguration[:phpApcu] ) its(:stdout) { should contain('apcu') } + else + its(:stdout) { should_not contain('apcu') } end its(:exit_status) { should eq 0 } @@ -95,18 +91,18 @@ describe command('php -m') do its(:stdout) { should contain('shmop') } - if ( os[:family] != 'alpine' ) + if ( $testConfiguration[:phpMhash] ) its(:stdout) { should contain('mhash') } + else + its(:stdout) { should_not contain('mhash') } end its(:stdout) { should contain('wddx') } - if (os[:family] == 'ubuntu' and (os[:version] == '12.04' or os[:version] == '16.04') ) or - (os[:family] == 'debian' and os[:version] == '7' ) or - (os[:family] == 'debian' and os[:version] == 'testing' ) - its(:stdout) { should_not contain('redis') } - else + if ( $testConfiguration[:phpRedis] ) its(:stdout) { should contain('redis') } + else + its(:stdout) { should_not contain('redis') } end its(:exit_status) { should eq 0 } @@ -116,7 +112,10 @@ shared_examples 'php7::modules' do describe command('php -m') do its(:stdout) { should contain('Zend OPcache') } - its(:stdout) { should contain('redis') } + + if ( $testConfiguration[:phpRedis] ) + its(:stdout) { should contain('redis') } + end its(:exit_status) { should eq 0 } end @@ -177,16 +176,12 @@ its(:stdout) { should contain('xsl') } its(:stdout) { should contain('zip') } its(:stdout) { should contain('zlib') } + its(:stdout) { should contain('gd') } - if ( os[:family] != 'alpine' ) - its(:stdout) { should contain('gd') } - end - - if !( - (os[:family] == 'ubuntu' and os[:version] == '12.04' ) or - (os[:family] == 'debian' and os[:version] == '7' ) - ) + if ( $testConfiguration[:phpApcu] ) its(:stdout) { should contain('apcu') } + else + its(:stdout) { should_not contain('apcu') } end its(:exit_status) { should eq 0 } @@ -220,18 +215,18 @@ describe command('curl --insecure --silent --retry 10 --fail http://localhost/php-test.php?test=get_loaded_extensions') do its(:stdout) { should contain('shmop') } - if ( os[:family] != 'alpine' ) + if ( $testConfiguration[:phpMhash] ) its(:stdout) { should contain('mhash') } + else + its(:stdout) { should_not contain('mhash') } end its(:stdout) { should contain('wddx') } - if (os[:family] == 'ubuntu' and (os[:version] == '12.04' or os[:version] == '16.04') ) or - (os[:family] == 'debian' and os[:version] == '7' ) or - (os[:family] == 'debian' and os[:version] == 'testing' ) - its(:stdout) { should_not contain('redis') } - else + if ( $testConfiguration[:phpRedis] ) its(:stdout) { should contain('redis') } + else + its(:stdout) { should_not contain('redis') } end its(:exit_status) { should eq 0 } @@ -241,7 +236,12 @@ shared_examples 'php-fpm7::modules' do describe command('curl --insecure --silent --retry 10 --fail http://localhost/php-test.php?test=get_loaded_extensions') do its(:stdout) { should contain('Zend OPcache') } - its(:stdout) { should contain('redis') } + + if ( $testConfiguration[:phpRedis] ) + its(:stdout) { should contain('redis') } + else + its(:stdout) { should_not contain('redis') } + end its(:exit_status) { should eq 0 } end diff --git a/test/spec/spec_helper.rb b/test/spec/spec_helper.rb index 0fd7c087f..552cab400 100644 --- a/test/spec/spec_helper.rb +++ b/test/spec/spec_helper.rb @@ -25,11 +25,26 @@ end $testConfiguration[:phpXdebug] = true +$testConfiguration[:phpApcu] = true +$testConfiguration[:phpRedis] = true +$testConfiguration[:phpMhash] = true if ENV['PHP_XDEBUG'] and ENV['PHP_XDEBUG'] == "0" $testConfiguration[:phpXdebug] = false end +if ENV['PHP_APCU'] and ENV['PHP_APCU'] == "0" + $testConfiguration[:phpApcu] = false +end + +if ENV['PHP_REDIS'] and ENV['PHP_REDIS'] == "0" + $testConfiguration[:phpRedis] = false +end + +if ENV['PHP_MHASH'] and ENV['PHP_MHASH'] == "0" + $testConfiguration[:phpMhash] = false +end + def wait_retry(time, increment = 1, elapsed_time = 0, &block) begin yield From 5a294e15276d4515cd4572578c026b64abf619d6 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sun, 19 Jun 2016 22:10:41 +0200 Subject: [PATCH 08/15] Fix alpine php build --- docker/php/alpine-3/Dockerfile | 4 ++-- template/Dockerfile/images/php5.jinja2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/php/alpine-3/Dockerfile b/docker/php/alpine-3/Dockerfile index 01ac1b93b..9ee8c7994 100644 --- a/docker/php/alpine-3/Dockerfile +++ b/docker/php/alpine-3/Dockerfile @@ -31,7 +31,7 @@ RUN /usr/local/bin/apk-install \ php-mysqli \ php-pdo_mysql \ php-pdo_sqlite \ - php-memcached \ + php5-memcached \ php-mcrypt \ php-gd \ php-bcmath \ @@ -61,7 +61,7 @@ RUN /usr/local/bin/apk-install \ geoip \ php-ldap \ php-memcache \ - php-redis \ + php5-redis \ php-pear \ php-phar \ php-openssl \ diff --git a/template/Dockerfile/images/php5.jinja2 b/template/Dockerfile/images/php5.jinja2 index eab1b5bb4..53f80d26c 100644 --- a/template/Dockerfile/images/php5.jinja2 +++ b/template/Dockerfile/images/php5.jinja2 @@ -16,7 +16,7 @@ RUN /usr/local/bin/apk-install \ php-mysqli \ php-pdo_mysql \ php-pdo_sqlite \ - php-memcached \ + php5-memcached \ php-mcrypt \ php-gd \ php-bcmath \ @@ -46,7 +46,7 @@ RUN /usr/local/bin/apk-install \ geoip \ php-ldap \ php-memcache \ - php-redis \ + php5-redis \ php-pear \ php-phar \ php-openssl \ From 73a21901d0586f3eed356f47b36adcc72ff4cea4 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sun, 19 Jun 2016 22:27:02 +0200 Subject: [PATCH 09/15] Add known issues to documentation --- FIXME.md | 14 --------- .../docs/content/KnownIssues/index.rst | 29 +++++++++++++++++++ documentation/docs/index.rst | 1 + 3 files changed, 30 insertions(+), 14 deletions(-) delete mode 100644 FIXME.md create mode 100644 documentation/docs/content/KnownIssues/index.rst diff --git a/FIXME.md b/FIXME.md deleted file mode 100644 index 0932eedd9..000000000 --- a/FIXME.md +++ /dev/null @@ -1,14 +0,0 @@ -# FIXME tasks -Mostly upstream issues (eg. missing or broken packages) - -## All PHP 7 -- Missing pear - -## Debian 7 (PHP 5) -- Missing redis - -## Alpine 3 (PHP5) -- Missing mhash - -## Alpine 3 (PHP7) -- Missing gd diff --git a/documentation/docs/content/KnownIssues/index.rst b/documentation/docs/content/KnownIssues/index.rst new file mode 100644 index 000000000..7e666197e --- /dev/null +++ b/documentation/docs/content/KnownIssues/index.rst @@ -0,0 +1,29 @@ +============ +Known issues +============ + +PHP images +---------- + +webdevops/php...:ubuntu-12.04 +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +- missing redis +- missing apcu + +webdevops/php...:debian-7 +^^^^^^^^^^^^^^^^^^^^^^^^^ + +- missing redis +- missing apcu + +webdevops/php...:debian-8-php7 +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +- missing xdebug + +webdevops/php...:debian-8-php7 +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +- missing redis +- missing mhash diff --git a/documentation/docs/index.rst b/documentation/docs/index.rst index 078a473e2..b6291cca4 100644 --- a/documentation/docs/index.rst +++ b/documentation/docs/index.rst @@ -28,3 +28,4 @@ Overview content/DockerImages/index content/Customization/index content/BuildingProcess/index + content/KnownIssues/index From 5dd650b52f9bc29a06d0f9bb4099908e6870ac5e Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 20 Jun 2016 08:31:16 +0200 Subject: [PATCH 10/15] Add xdebug switch for alpine --- .../conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../centos-7/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../debian-7/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../debian-8/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../debian-9/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../centos-7/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../debian-7/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../debian-8/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../debian-9/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../centos-7/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../debian-7/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../debian-8/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../debian-9/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh | 2 ++ .../php-dev/general/provision/entrypoint.d/10-php-debugger.sh | 2 ++ 40 files changed, 80 insertions(+) diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-apache-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-apache-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-nginx-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini diff --git a/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh b/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh index f29d015ff..5c836f49d 100644 --- a/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh +++ b/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh @@ -19,6 +19,8 @@ function phpModuleDisable() { } PHP_XDEBUG_FILES=" +/etc/php5/conf.d/xdebug.ini +/etc/php7/conf.d/xdebug.ini /etc/php.d/xdebug.ini /etc/php5/mods-available/xdebug.ini /etc/php5/cli/conf.d/20-xdebug.ini From cf0245bc707e5f96e23532e0b877cf0e18dccb37 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 20 Jun 2016 20:25:13 +0200 Subject: [PATCH 11/15] Fix php modules for alpine (workaround) Link all php5 modules/configuration files to php --- .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ docker/php-dev/alpine-3/Dockerfile | 2 +- .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../webdevops-php-dev/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ template/Dockerfile/images/php5-dev.jinja2 | 2 +- test/run.sh | 5 --- 83 files changed, 1682 insertions(+), 7 deletions(-) create mode 100644 docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine-3/Dockerfile index 88214d5b0..ba754d5b6 100644 --- a/docker/php-dev/alpine-3/Dockerfile +++ b/docker/php-dev/alpine-3/Dockerfile @@ -17,7 +17,7 @@ RUN /usr/local/bin/apk-install \ # Install tools graphviz \ # Install php development stuff - php-xdebug \ + php5-xdebug \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index d0fa4ded5..2c5d76e3d 100644 --- a/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,6 +2,7 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.blackfire.yml diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/template/Dockerfile/images/php5-dev.jinja2 b/template/Dockerfile/images/php5-dev.jinja2 index c0e7ade47..6c75e297a 100644 --- a/template/Dockerfile/images/php5-dev.jinja2 +++ b/template/Dockerfile/images/php5-dev.jinja2 @@ -6,7 +6,7 @@ RUN /usr/local/bin/apk-install \ # Install tools graphviz \ # Install php development stuff - php-xdebug \ + php5-xdebug \ {{ provision.runRoleInline('php-dev', role) }} {%- endmacro %} diff --git a/test/run.sh b/test/run.sh index 91c2280ac..2074b1105 100755 --- a/test/run.sh +++ b/test/run.sh @@ -223,11 +223,6 @@ function setupDockerTagEnvironment() { export PHP_APCU=0 export PHP_REDIS=0 ;; - - alpine-3) - export PHP_REDIS=0 - export PHP_MHASH=0 - ;; esac } From 441066b7d1b412e47bfe3535d04df776e946518c Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 20 Jun 2016 20:46:03 +0200 Subject: [PATCH 12/15] Fix duplicate password in vsftp image Fixes #99 --- docker/vsftp/latest/Dockerfile | 1 - .../conf/provision/roles/webdevops-vsftp/defaults/main.yml | 1 - .../general/provision/roles/webdevops-vsftp/defaults/main.yml | 1 - template/Dockerfile/environment.jinja2 | 1 - 4 files changed, 4 deletions(-) diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index 9179a39cd..b2cb161cb 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -14,7 +14,6 @@ ENV FTP_USER application ENV FTP_PASSWORD application ENV FTP_UID 1000 ENV FTP_GID 1000 -ENV FTP_PASSWORD dev ENV FTP_PATH /data/ftp/ COPY conf/ /opt/docker/ diff --git a/docker/vsftp/latest/conf/provision/roles/webdevops-vsftp/defaults/main.yml b/docker/vsftp/latest/conf/provision/roles/webdevops-vsftp/defaults/main.yml index b10bf23ea..5dc3f1149 100644 --- a/docker/vsftp/latest/conf/provision/roles/webdevops-vsftp/defaults/main.yml +++ b/docker/vsftp/latest/conf/provision/roles/webdevops-vsftp/defaults/main.yml @@ -7,5 +7,4 @@ FTP_USER: "{{ lookup('env','FTP_USER') }}" FTP_PASSWORD: "{{ lookup('env','FTP_PASSWORD') }}" FTP_UID: "{{ lookup('env','FTP_UID') }}" FTP_GID: "{{ lookup('env','FTP_GID') }}" -FTP_PASSWORD: "{{ lookup('env','FTP_PASSWORD') }}" FTP_PATH: "{{ lookup('env','FTP_PATH') }}" diff --git a/provisioning/vsftp/general/provision/roles/webdevops-vsftp/defaults/main.yml b/provisioning/vsftp/general/provision/roles/webdevops-vsftp/defaults/main.yml index b10bf23ea..5dc3f1149 100644 --- a/provisioning/vsftp/general/provision/roles/webdevops-vsftp/defaults/main.yml +++ b/provisioning/vsftp/general/provision/roles/webdevops-vsftp/defaults/main.yml @@ -7,5 +7,4 @@ FTP_USER: "{{ lookup('env','FTP_USER') }}" FTP_PASSWORD: "{{ lookup('env','FTP_PASSWORD') }}" FTP_UID: "{{ lookup('env','FTP_UID') }}" FTP_GID: "{{ lookup('env','FTP_GID') }}" -FTP_PASSWORD: "{{ lookup('env','FTP_PASSWORD') }}" FTP_PATH: "{{ lookup('env','FTP_PATH') }}" diff --git a/template/Dockerfile/environment.jinja2 b/template/Dockerfile/environment.jinja2 index 3e99d90f0..0f4a2b196 100644 --- a/template/Dockerfile/environment.jinja2 +++ b/template/Dockerfile/environment.jinja2 @@ -32,7 +32,6 @@ ENV FTP_USER application ENV FTP_PASSWORD application ENV FTP_UID 1000 ENV FTP_GID 1000 -ENV FTP_PASSWORD dev ENV FTP_PATH /data/ftp/ {%- endmacro %} From 64aa17f4c49d241b8d33842c7f4e43d276f10bfd Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 20 Jun 2016 20:48:20 +0200 Subject: [PATCH 13/15] Add environment variables to vsftp documentation --- .../docs/content/DockerImages/dockerfiles/vsftp.rst | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/documentation/docs/content/DockerImages/dockerfiles/vsftp.rst b/documentation/docs/content/DockerImages/dockerfiles/vsftp.rst index 98996b1e9..2542cbe04 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/vsftp.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/vsftp.rst @@ -3,3 +3,16 @@ webdevops/vsftp =============== These image extends ``webdevops/base`` and provides a standalone vsftp server running on port 20 and 21. + +Environment variables +--------------------- + +========================= ==================================== ================== +Environment variable Description Default +========================= ==================================== ================== +``FTP_USER`` FTP account username ``application`` +``FTP_PASSWORD`` FTP account password ``application`` +``FTP_UID`` FTP account uid ``1000`` +``FTP_GID`` FTP account gid ``1000`` +``FTP_PATH`` FTP account home path ``/data/ftp/`` +========================= ==================================== ================== From db24bae289dc3c3830f77277160dbb46c1464bf1 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 20 Jun 2016 21:56:33 +0200 Subject: [PATCH 14/15] Fix php modules for alpine (workaround) part 2 Add missing part for php, php-apache and php-nginx images --- .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../roles/webdevops-php/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../roles/webdevops-php/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../roles/webdevops-php/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../roles/webdevops-php/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../roles/webdevops-php/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../roles/webdevops-php/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../roles/webdevops-php/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../roles/webdevops-php/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../roles/webdevops-php/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ .../dockerfiles/include/image-tag-php.rst | 2 +- .../docs/content/KnownIssues/index.rst | 11 +++-- .../roles/webdevops-php/tasks/bootstrap.yml | 1 + .../tasks/bootstrap/php-module.yml | 41 +++++++++++++++++++ test/run.sh | 4 ++ 27 files changed, 594 insertions(+), 7 deletions(-) create mode 100644 docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml create mode 100644 docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml create mode 100644 docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml create mode 100644 docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml create mode 100644 docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml create mode 100644 docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml create mode 100644 docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml create mode 100644 docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml create mode 100644 docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml create mode 100644 docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml create mode 100644 docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml create mode 100644 docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml create mode 100644 docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml create mode 100644 provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap.yml index 5883fa1fe..11abd3f0e 100644 --- a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap.yml +++ b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap.yml @@ -1,6 +1,7 @@ --- - include: bootstrap/php.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-fpm.main.yml - include: bootstrap/php-fpm.pool.yml - include: bootstrap/php-fpm.yml diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap.yml index 5883fa1fe..11abd3f0e 100644 --- a/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap.yml +++ b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap.yml @@ -1,6 +1,7 @@ --- - include: bootstrap/php.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-fpm.main.yml - include: bootstrap/php-fpm.pool.yml - include: bootstrap/php-fpm.yml diff --git a/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml index 5883fa1fe..11abd3f0e 100644 --- a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml +++ b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml @@ -1,6 +1,7 @@ --- - include: bootstrap/php.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-fpm.main.yml - include: bootstrap/php-fpm.pool.yml - include: bootstrap/php-fpm.yml diff --git a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml index 5883fa1fe..11abd3f0e 100644 --- a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml +++ b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml @@ -1,6 +1,7 @@ --- - include: bootstrap/php.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-fpm.main.yml - include: bootstrap/php-fpm.pool.yml - include: bootstrap/php-fpm.yml diff --git a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap.yml index 5883fa1fe..11abd3f0e 100644 --- a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap.yml +++ b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap.yml @@ -1,6 +1,7 @@ --- - include: bootstrap/php.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-fpm.main.yml - include: bootstrap/php-fpm.pool.yml - include: bootstrap/php-fpm.yml diff --git a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap.yml index 5883fa1fe..11abd3f0e 100644 --- a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap.yml +++ b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap.yml @@ -1,6 +1,7 @@ --- - include: bootstrap/php.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-fpm.main.yml - include: bootstrap/php-fpm.pool.yml - include: bootstrap/php-fpm.yml diff --git a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap.yml index 5883fa1fe..11abd3f0e 100644 --- a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap.yml +++ b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap.yml @@ -1,6 +1,7 @@ --- - include: bootstrap/php.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-fpm.main.yml - include: bootstrap/php-fpm.pool.yml - include: bootstrap/php-fpm.yml diff --git a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap.yml index 5883fa1fe..11abd3f0e 100644 --- a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap.yml +++ b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap.yml @@ -1,6 +1,7 @@ --- - include: bootstrap/php.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-fpm.main.yml - include: bootstrap/php-fpm.pool.yml - include: bootstrap/php-fpm.yml diff --git a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap.yml index 5883fa1fe..11abd3f0e 100644 --- a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap.yml +++ b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap.yml @@ -1,6 +1,7 @@ --- - include: bootstrap/php.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-fpm.main.yml - include: bootstrap/php-fpm.pool.yml - include: bootstrap/php-fpm.yml diff --git a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst index 153c12b89..abbedcaee 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst @@ -8,7 +8,7 @@ Tag Distribution name PHP Version ``ubuntu-16.04`` xenial (LTS) PHP 7.0 ``debian-7`` wheezy PHP 5.4 ``debian-8`` jessie PHP 5.6 -``debian-8-php7`` jessie with dotdeb PHP 7.x (via dotdeb) +``debian-8-php7`` jessie with dotdeb PHP 7.x (via sury) ``debian-9`` stretch PHP 7.0 ``centos-7`` PHP 5.4 ====================== ========================== =============== diff --git a/documentation/docs/content/KnownIssues/index.rst b/documentation/docs/content/KnownIssues/index.rst index 7e666197e..febe81a76 100644 --- a/documentation/docs/content/KnownIssues/index.rst +++ b/documentation/docs/content/KnownIssues/index.rst @@ -17,13 +17,12 @@ webdevops/php...:debian-7 - missing redis - missing apcu -webdevops/php...:debian-8-php7 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +webdevops/php...:alpine-3 +^^^^^^^^^^^^^^^^^^^^^^^^^ -- missing xdebug +- missing mhash -webdevops/php...:debian-8-php7 +webdevops/php...-dev:debian-8-php7 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -- missing redis -- missing mhash +- missing xdebug diff --git a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap.yml b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap.yml index 5883fa1fe..11abd3f0e 100644 --- a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap.yml +++ b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap.yml @@ -1,6 +1,7 @@ --- - include: bootstrap/php.yml +- include: bootstrap/php-module.yml - include: bootstrap/php-fpm.main.yml - include: bootstrap/php-fpm.pool.yml - include: bootstrap/php-fpm.yml diff --git a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml @@ -0,0 +1,41 @@ +--- + +############################# +# Workaround PHP configuration files +# for alpine +############################# + +- name: Get list of PHP5 configuration files + command: "ls /etc/php5/conf.d/ |grep .ini" + register: php5_ini + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link configuration files from php5 to php + file: + src: '/etc/php5/conf.d/{{ item }}' + dest: '/etc/php/conf.d/{{ item }}' + state: link + with_items: "{{ php5_ini.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_ini is defined + ignore_errors: yes + +############################# +# Workaround PHP module files +# for alpine +############################# + +- name: Get list of PHP5 modules + command: "ls /usr/lib/php5/modules/ |grep .so" + register: php5_modules + when: ansible_distribution == 'Alpine' + ignore_errors: yes + +- name: Link module files from php5 to php + file: + src: '/usr/lib/php5/modules/{{ item }}' + dest: '/usr/lib/php/modules/{{ item }}' + state: link + with_items: "{{ php5_modules.stdout_lines }}" + when: ansible_distribution == 'Alpine' and php5_modules is defined + ignore_errors: yes diff --git a/test/run.sh b/test/run.sh index 2074b1105..9fa1547be 100755 --- a/test/run.sh +++ b/test/run.sh @@ -219,6 +219,10 @@ function setupDockerTagEnvironment() { export PHP_XDEBUG=0 ;; + alpine-3) + export PHP_MHASH=0 + ;; + centos-7-php56) export PHP_APCU=0 export PHP_REDIS=0 From cc15afecf76b960d28dcf3bf2825ea6e2d2fcec6 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 20 Jun 2016 22:47:33 +0200 Subject: [PATCH 15/15] Version bump --- CHANGELOG.md | 30 ++++++------------- docker/ansible/alpine-3/Dockerfile | 4 +-- docker/ansible/centos-7/Dockerfile | 4 +-- docker/ansible/debian-7/Dockerfile | 4 +-- docker/ansible/debian-8/Dockerfile | 4 +-- docker/ansible/debian-9/Dockerfile | 4 +-- docker/ansible/ubuntu-12.04/Dockerfile | 4 +-- docker/ansible/ubuntu-14.04/Dockerfile | 4 +-- docker/ansible/ubuntu-15.04/Dockerfile | 4 +-- docker/ansible/ubuntu-15.10/Dockerfile | 4 +-- docker/ansible/ubuntu-16.04/Dockerfile | 4 +-- docker/apache/alpine-3/Dockerfile | 4 +-- docker/apache/centos-7/Dockerfile | 4 +-- docker/apache/debian-7/Dockerfile | 4 +-- docker/apache/debian-8/Dockerfile | 4 +-- docker/apache/debian-9/Dockerfile | 4 +-- docker/apache/ubuntu-12.04/Dockerfile | 4 +-- docker/apache/ubuntu-14.04/Dockerfile | 4 +-- docker/apache/ubuntu-15.04/Dockerfile | 4 +-- docker/apache/ubuntu-15.10/Dockerfile | 4 +-- docker/apache/ubuntu-16.04/Dockerfile | 4 +-- docker/base-app/alpine-3/Dockerfile | 4 +-- docker/base-app/centos-7/Dockerfile | 4 +-- docker/base-app/debian-7/Dockerfile | 4 +-- docker/base-app/debian-8/Dockerfile | 4 +-- docker/base-app/debian-9/Dockerfile | 4 +-- docker/base-app/ubuntu-12.04/Dockerfile | 4 +-- docker/base-app/ubuntu-14.04/Dockerfile | 4 +-- docker/base-app/ubuntu-15.04/Dockerfile | 4 +-- docker/base-app/ubuntu-15.10/Dockerfile | 4 +-- docker/base-app/ubuntu-16.04/Dockerfile | 4 +-- docker/base/alpine-3/Dockerfile | 4 +-- docker/base/alpine-3/conf/VERSION | 2 +- docker/base/centos-7/Dockerfile | 4 +-- docker/base/centos-7/conf/VERSION | 2 +- docker/base/debian-7/Dockerfile | 4 +-- docker/base/debian-7/conf/VERSION | 2 +- docker/base/debian-8/Dockerfile | 4 +-- docker/base/debian-8/conf/VERSION | 2 +- docker/base/debian-9/Dockerfile | 4 +-- docker/base/debian-9/conf/VERSION | 2 +- docker/base/ubuntu-12.04/Dockerfile | 4 +-- docker/base/ubuntu-12.04/conf/VERSION | 2 +- docker/base/ubuntu-14.04/Dockerfile | 4 +-- docker/base/ubuntu-14.04/conf/VERSION | 2 +- docker/base/ubuntu-15.04/Dockerfile | 4 +-- docker/base/ubuntu-15.04/conf/VERSION | 2 +- docker/base/ubuntu-15.10/Dockerfile | 4 +-- docker/base/ubuntu-15.10/conf/VERSION | 2 +- docker/base/ubuntu-16.04/Dockerfile | 4 +-- docker/base/ubuntu-16.04/conf/VERSION | 2 +- docker/bootstrap/alpine-3/Dockerfile | 4 +-- docker/bootstrap/centos-7/Dockerfile | 4 +-- docker/bootstrap/debian-7/Dockerfile | 4 +-- docker/bootstrap/debian-8/Dockerfile | 4 +-- docker/bootstrap/debian-9/Dockerfile | 4 +-- docker/bootstrap/ubuntu-12.04/Dockerfile | 4 +-- docker/bootstrap/ubuntu-14.04/Dockerfile | 4 +-- docker/bootstrap/ubuntu-15.04/Dockerfile | 4 +-- docker/bootstrap/ubuntu-15.10/Dockerfile | 4 +-- docker/bootstrap/ubuntu-16.04/Dockerfile | 4 +-- docker/hhvm-apache/ubuntu-14.04/Dockerfile | 4 +-- docker/hhvm-apache/ubuntu-16.04/Dockerfile | 4 +-- docker/hhvm-nginx/ubuntu-14.04/Dockerfile | 4 +-- docker/hhvm-nginx/ubuntu-16.04/Dockerfile | 4 +-- docker/hhvm/ubuntu-14.04/Dockerfile | 4 +-- docker/hhvm/ubuntu-16.04/Dockerfile | 4 +-- docker/mail-sandbox/latest/Dockerfile | 4 +-- docker/nginx/alpine-3/Dockerfile | 4 +-- docker/nginx/centos-7/Dockerfile | 4 +-- docker/nginx/debian-7/Dockerfile | 4 +-- docker/nginx/debian-8/Dockerfile | 4 +-- docker/nginx/debian-9/Dockerfile | 4 +-- docker/nginx/ubuntu-12.04/Dockerfile | 4 +-- docker/nginx/ubuntu-14.04/Dockerfile | 4 +-- docker/nginx/ubuntu-15.04/Dockerfile | 4 +-- docker/nginx/ubuntu-15.10/Dockerfile | 4 +-- docker/nginx/ubuntu-16.04/Dockerfile | 4 +-- .../php-apache-dev/alpine-3-php7/Dockerfile | 4 +-- docker/php-apache-dev/alpine-3/Dockerfile | 4 +-- .../php-apache-dev/centos-7-php56/Dockerfile | 4 +-- docker/php-apache-dev/centos-7/Dockerfile | 4 +-- docker/php-apache-dev/debian-7/Dockerfile | 4 +-- .../php-apache-dev/debian-8-php7/Dockerfile | 4 +-- docker/php-apache-dev/debian-8/Dockerfile | 4 +-- docker/php-apache-dev/debian-9/Dockerfile | 4 +-- docker/php-apache-dev/ubuntu-12.04/Dockerfile | 4 +-- docker/php-apache-dev/ubuntu-14.04/Dockerfile | 4 +-- docker/php-apache-dev/ubuntu-15.04/Dockerfile | 4 +-- docker/php-apache-dev/ubuntu-15.10/Dockerfile | 4 +-- docker/php-apache-dev/ubuntu-16.04/Dockerfile | 4 +-- docker/php-apache/alpine-3-php7/Dockerfile | 4 +-- docker/php-apache/alpine-3/Dockerfile | 4 +-- docker/php-apache/centos-7-php56/Dockerfile | 4 +-- docker/php-apache/centos-7/Dockerfile | 4 +-- docker/php-apache/debian-7/Dockerfile | 4 +-- docker/php-apache/debian-8-php7/Dockerfile | 4 +-- docker/php-apache/debian-8/Dockerfile | 4 +-- docker/php-apache/debian-9/Dockerfile | 4 +-- docker/php-apache/ubuntu-12.04/Dockerfile | 4 +-- docker/php-apache/ubuntu-14.04/Dockerfile | 4 +-- docker/php-apache/ubuntu-15.04/Dockerfile | 4 +-- docker/php-apache/ubuntu-15.10/Dockerfile | 4 +-- docker/php-apache/ubuntu-16.04/Dockerfile | 4 +-- docker/php-dev/alpine-3-php7/Dockerfile | 4 +-- docker/php-dev/alpine-3/Dockerfile | 4 +-- docker/php-dev/centos-7-php56/Dockerfile | 4 +-- docker/php-dev/centos-7/Dockerfile | 4 +-- docker/php-dev/debian-7/Dockerfile | 4 +-- docker/php-dev/debian-8-php7/Dockerfile | 4 +-- docker/php-dev/debian-8/Dockerfile | 4 +-- docker/php-dev/debian-9/Dockerfile | 4 +-- docker/php-dev/ubuntu-12.04/Dockerfile | 4 +-- docker/php-dev/ubuntu-14.04/Dockerfile | 4 +-- docker/php-dev/ubuntu-15.04/Dockerfile | 4 +-- docker/php-dev/ubuntu-15.10/Dockerfile | 4 +-- docker/php-dev/ubuntu-16.04/Dockerfile | 4 +-- docker/php-nginx-dev/alpine-3-php7/Dockerfile | 4 +-- docker/php-nginx-dev/alpine-3/Dockerfile | 4 +-- .../php-nginx-dev/centos-7-php56/Dockerfile | 4 +-- docker/php-nginx-dev/centos-7/Dockerfile | 4 +-- docker/php-nginx-dev/debian-7/Dockerfile | 4 +-- docker/php-nginx-dev/debian-8-php7/Dockerfile | 4 +-- docker/php-nginx-dev/debian-8/Dockerfile | 4 +-- docker/php-nginx-dev/debian-9/Dockerfile | 4 +-- docker/php-nginx-dev/ubuntu-12.04/Dockerfile | 4 +-- docker/php-nginx-dev/ubuntu-14.04/Dockerfile | 4 +-- docker/php-nginx-dev/ubuntu-15.04/Dockerfile | 4 +-- docker/php-nginx-dev/ubuntu-15.10/Dockerfile | 4 +-- docker/php-nginx-dev/ubuntu-16.04/Dockerfile | 4 +-- docker/php-nginx/alpine-3-php7/Dockerfile | 4 +-- docker/php-nginx/alpine-3/Dockerfile | 4 +-- docker/php-nginx/centos-7-php56/Dockerfile | 4 +-- docker/php-nginx/centos-7/Dockerfile | 4 +-- docker/php-nginx/debian-7/Dockerfile | 4 +-- docker/php-nginx/debian-8-php7/Dockerfile | 4 +-- docker/php-nginx/debian-8/Dockerfile | 4 +-- docker/php-nginx/debian-9/Dockerfile | 4 +-- docker/php-nginx/ubuntu-12.04/Dockerfile | 4 +-- docker/php-nginx/ubuntu-14.04/Dockerfile | 4 +-- docker/php-nginx/ubuntu-15.04/Dockerfile | 4 +-- docker/php-nginx/ubuntu-15.10/Dockerfile | 4 +-- docker/php-nginx/ubuntu-16.04/Dockerfile | 4 +-- docker/php/alpine-3-php7/Dockerfile | 4 +-- docker/php/alpine-3/Dockerfile | 4 +-- docker/php/centos-7-php56/Dockerfile | 4 +-- docker/php/centos-7/Dockerfile | 4 +-- docker/php/debian-7/Dockerfile | 4 +-- docker/php/debian-8-php7/Dockerfile | 4 +-- docker/php/debian-8/Dockerfile | 4 +-- docker/php/debian-9/Dockerfile | 4 +-- docker/php/ubuntu-12.04/Dockerfile | 4 +-- docker/php/ubuntu-14.04/Dockerfile | 4 +-- docker/php/ubuntu-15.04/Dockerfile | 4 +-- docker/php/ubuntu-15.10/Dockerfile | 4 +-- docker/php/ubuntu-16.04/Dockerfile | 4 +-- docker/piwik/ubuntu-14.04/Dockerfile | 4 +-- docker/postfix/latest/Dockerfile | 4 +-- docker/samson-deployment/latest/Dockerfile | 4 +-- docker/samson-deployment/latest/conf/VERSION | 2 +- docker/sphinx/latest/Dockerfile | 4 +-- docker/ssh/latest/Dockerfile | 4 +-- docker/storage/latest/Dockerfile | 4 +-- docker/typo3/ubuntu-14.04/Dockerfile | 4 +-- docker/varnish/latest/Dockerfile | 4 +-- docker/vsftp/latest/Dockerfile | 4 +-- provisioning/base/general/VERSION | 2 +- template/Dockerfile/docker.jinja2 | 4 +-- 168 files changed, 331 insertions(+), 343 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d6339f5e..bc18e0994 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,55 +4,52 @@ This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/D ## [1.0.0] - upcoming +## [0.52.0] - 2016-06-20 +- Added tag centos-7-php56 for php images +- Added POSTFIX_MYNETWORKS and POSTFIX_RELAYHOST environment variables +- Added pysed +- Added PHP_DEBUGGER environment variable for php*dev images +- Fix warnings in vsftp image +- Fix package names in alpine (broken build) +- Updated documentation and tests + ## [0.51.0] - 2016-06-16 -### Added - Added php module apcu - Added (disabled) php module blackfire to php-dev and inherit images - Added apt-transport-https for debian family images -### Changed - Added link from /etc/aliases to /etc/postfix/alises for alpine ## [0.50.6] - 2016-06-14 -### Changed - Switch from dotdeb to sury and install libpcre3 from testing ## [0.50.5] - 2016-06-10 -### Added - Added Magallanes deployer for samson-deployment -### Changed - Improved documentation ## [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 - Restructured documentation, Added customization section ## [0.50.1] - 2016-05-24 -### Changed - Fixed required root rights for entrypoint, provisioning is now only running when entrypoint is entered with root - Modularized service.d scripts (will include servide.d/$serv.d/*.sh before execution) ## [0.50.0] - 2016-05-23 -### Changed - Improve image sizes (backported to 0.23.0 due to build issues) - Improved provisioning system with new python wrapper - Modularized apache and nginx configuration @@ -60,45 +57,36 @@ This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/D - webdevops/storage is now using busybox - Latest tag is now ubuntu 16.04 - Set clear_env to no for php-fpm (if possible) -### Added - Added ubuntu 16.04 images (eg. php, hhvm) - Added webdevops/php-dev webdevops/php-apache-dev webdevops/php-nginx-dev (xdebug and disabled caching for webserver) - Added webdevops/varnish - Added mod_expire for webdevops/apache ## [0.23.0] - 2016-04-03 -### Changed - Enabled alpine-3-php7 images - Fixed some smaller issues - Added TYPO3 packages to sphinx image - Fixed build system for new docker version (1.11.0) ## [0.22.0] - 2016-04-03 -### Changed - Introduced base-app for application images - Added alpine-3 images - Added sphinx image ## [0.21.6] - 2016-03-25 -### Changed - Refactored directory layout (container -> docker/, .bin -> bin, testsuite -> test/ ## [0.21.5] - 2016-03-24 -### Added - Fixed permissions automatically for /tmp if mounted as volume - Added error checks for samson service script ## [0.21.0] - 2016-03-20 -### Changed - Improved entrypoint startup time - Removed entrypoint ansible provisioning if not needed - Added java-jre and latest npm for samson-deployment ## [0.20.0] - 2016-02-24 -### Added - Added sqlite to base images - -### Changed - Moved WEB_DOCUMENT_ROOT to /app (from /application/code) - Improved samson-deployment diff --git a/docker/ansible/alpine-3/Dockerfile b/docker/ansible/alpine-3/Dockerfile index 63518f784..b48ef9a30 100644 --- a/docker/ansible/alpine-3/Dockerfile +++ b/docker/ansible/alpine-3/Dockerfile @@ -7,5 +7,5 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index e83b4fba6..126b4dda5 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -7,5 +7,5 @@ FROM webdevops/bootstrap:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index 17942a2d0..9717f76e7 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -7,5 +7,5 @@ FROM webdevops/bootstrap:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index 63e4b3678..347296936 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -7,5 +7,5 @@ FROM webdevops/bootstrap:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index f9508be87..d560995aa 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -7,5 +7,5 @@ FROM webdevops/bootstrap:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index 9c674eb32..e7a86ad01 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -7,5 +7,5 @@ FROM webdevops/bootstrap:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index 6b5488b28..ee8bdc7fc 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -7,5 +7,5 @@ FROM webdevops/bootstrap:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index 4628ee3d4..6f593c1e0 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -7,5 +7,5 @@ FROM webdevops/bootstrap:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index c27f331d9..75a2b05c7 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -7,5 +7,5 @@ FROM webdevops/bootstrap:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index d77cfc5f8..67ff32201 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -7,5 +7,5 @@ FROM webdevops/bootstrap:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 diff --git a/docker/apache/alpine-3/Dockerfile b/docker/apache/alpine-3/Dockerfile index 840746894..aef7b0433 100644 --- a/docker/apache/alpine-3/Dockerfile +++ b/docker/apache/alpine-3/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index 2aa69f245..61dd2886e 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index de3e11cc6..3d6cf4c66 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index 703b00656..e2e328f30 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index 7a1759024..921b6bc65 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index b0b3ba68e..240511ede 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index 9083a6eb3..360453c71 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index cd97f7778..b4658cb76 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index 0361e331c..c1d00786d 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index 15e7efed7..7384816ae 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/base-app/alpine-3/Dockerfile b/docker/base-app/alpine-3/Dockerfile index f15dd0570..034264a0a 100644 --- a/docker/base-app/alpine-3/Dockerfile +++ b/docker/base-app/alpine-3/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index d6301413d..5f223b9eb 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index 2f2ebd8b3..236d639c7 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index 4721a4187..11d1b1d14 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index 6cc819601..9aea4e5f5 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index a46c959d7..39e01645a 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index dfc58f65d..ed365b422 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index 48d769636..645631828 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index c1ee93769..60c62fb5b 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index 3e0bc4ef0..4f9681ee0 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile index 666e77574..ef0bb2181 100644 --- a/docker/base/alpine-3/Dockerfile +++ b/docker/base/alpine-3/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/alpine-3/conf/VERSION b/docker/base/alpine-3/conf/VERSION index 62f945751..301160a93 100644 --- a/docker/base/alpine-3/conf/VERSION +++ b/docker/base/alpine-3/conf/VERSION @@ -1 +1 @@ -6 \ No newline at end of file +8 \ No newline at end of file diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 1d5c5de76..132708f9e 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/bootstrap:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/centos-7/conf/VERSION b/docker/base/centos-7/conf/VERSION index 62f945751..301160a93 100644 --- a/docker/base/centos-7/conf/VERSION +++ b/docker/base/centos-7/conf/VERSION @@ -1 +1 @@ -6 \ No newline at end of file +8 \ No newline at end of file diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index ea4cf575b..1ce51491d 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/bootstrap:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-7/conf/VERSION b/docker/base/debian-7/conf/VERSION index 62f945751..301160a93 100644 --- a/docker/base/debian-7/conf/VERSION +++ b/docker/base/debian-7/conf/VERSION @@ -1 +1 @@ -6 \ No newline at end of file +8 \ No newline at end of file diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index e2cc1d4c8..1a951ac37 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/bootstrap:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-8/conf/VERSION b/docker/base/debian-8/conf/VERSION index 62f945751..301160a93 100644 --- a/docker/base/debian-8/conf/VERSION +++ b/docker/base/debian-8/conf/VERSION @@ -1 +1 @@ -6 \ No newline at end of file +8 \ No newline at end of file diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 2a1c541e9..a855f3d34 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/bootstrap:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-9/conf/VERSION b/docker/base/debian-9/conf/VERSION index 62f945751..301160a93 100644 --- a/docker/base/debian-9/conf/VERSION +++ b/docker/base/debian-9/conf/VERSION @@ -1 +1 @@ -6 \ No newline at end of file +8 \ No newline at end of file diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index ce217f108..423bfb265 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/bootstrap:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-12.04/conf/VERSION b/docker/base/ubuntu-12.04/conf/VERSION index 62f945751..301160a93 100644 --- a/docker/base/ubuntu-12.04/conf/VERSION +++ b/docker/base/ubuntu-12.04/conf/VERSION @@ -1 +1 @@ -6 \ No newline at end of file +8 \ No newline at end of file diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 621263c56..c59d71fcb 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/bootstrap:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-14.04/conf/VERSION b/docker/base/ubuntu-14.04/conf/VERSION index 62f945751..301160a93 100644 --- a/docker/base/ubuntu-14.04/conf/VERSION +++ b/docker/base/ubuntu-14.04/conf/VERSION @@ -1 +1 @@ -6 \ No newline at end of file +8 \ No newline at end of file diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 81d37db3e..52877fb67 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/bootstrap:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-15.04/conf/VERSION b/docker/base/ubuntu-15.04/conf/VERSION index 62f945751..301160a93 100644 --- a/docker/base/ubuntu-15.04/conf/VERSION +++ b/docker/base/ubuntu-15.04/conf/VERSION @@ -1 +1 @@ -6 \ No newline at end of file +8 \ No newline at end of file diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 8df2be64a..eb49e23c2 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/bootstrap:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-15.10/conf/VERSION b/docker/base/ubuntu-15.10/conf/VERSION index 62f945751..301160a93 100644 --- a/docker/base/ubuntu-15.10/conf/VERSION +++ b/docker/base/ubuntu-15.10/conf/VERSION @@ -1 +1 @@ -6 \ No newline at end of file +8 \ No newline at end of file diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index b3efbfa8c..ec73b3f51 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/bootstrap:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-16.04/conf/VERSION b/docker/base/ubuntu-16.04/conf/VERSION index 62f945751..301160a93 100644 --- a/docker/base/ubuntu-16.04/conf/VERSION +++ b/docker/base/ubuntu-16.04/conf/VERSION @@ -1 +1 @@ -6 \ No newline at end of file +8 \ No newline at end of file diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index a653284d1..e8e64e8c2 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine-3/Dockerfile @@ -7,8 +7,8 @@ FROM alpine:3.3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 06b733c88..d2e1636bc 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -7,8 +7,8 @@ FROM centos:7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index aaa0d3fe2..c7d91fe9c 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -7,8 +7,8 @@ FROM debian:7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index ddc5c16ef..27c67f3cc 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -7,8 +7,8 @@ FROM debian:8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index a37d8500e..33ab007f2 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -7,8 +7,8 @@ FROM debian:stretch MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 # 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 b7d43bc4c..c006acba9 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -7,8 +7,8 @@ FROM ubuntu:12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 # 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 b1d8eab72..0d98a4ba8 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -7,8 +7,8 @@ FROM ubuntu:14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 # 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 b1ae6d6de..4b8d36db3 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -7,8 +7,8 @@ FROM ubuntu:15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 # 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 64c174977..52a173165 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -7,8 +7,8 @@ FROM ubuntu:15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 # 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 417f270d7..b23e927ea 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -7,8 +7,8 @@ FROM ubuntu:16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 # 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 65f4f6ac5..f588a7779 100644 --- a/docker/hhvm-apache/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-14.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/hhvm:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm-apache/ubuntu-16.04/Dockerfile b/docker/hhvm-apache/ubuntu-16.04/Dockerfile index e141fa7d6..bc08cd21f 100644 --- a/docker/hhvm-apache/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-16.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/hhvm:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile index 80ada07af..b25debc11 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/hhvm:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile index c54f1009e..4bb7d54b2 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/hhvm:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm/ubuntu-14.04/Dockerfile b/docker/hhvm/ubuntu-14.04/Dockerfile index 7c9cd8770..c88686ab3 100644 --- a/docker/hhvm/ubuntu-14.04/Dockerfile +++ b/docker/hhvm/ubuntu-14.04/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm/ubuntu-16.04/Dockerfile b/docker/hhvm/ubuntu-16.04/Dockerfile index 5b53845e1..02081d7ce 100644 --- a/docker/hhvm/ubuntu-16.04/Dockerfile +++ b/docker/hhvm/ubuntu-16.04/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index 1a4d1658d..a3511e19e 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/postfix:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV MAILBOX_USERNAME "sandbox" ENV MAILBOX_PASSWORD "mail" diff --git a/docker/nginx/alpine-3/Dockerfile b/docker/nginx/alpine-3/Dockerfile index c5b247eb6..de84b57a5 100644 --- a/docker/nginx/alpine-3/Dockerfile +++ b/docker/nginx/alpine-3/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index aa039154f..925a82013 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index ecbd18772..cf3fdbcfc 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index ff643aea5..ab010eab0 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index e3b0ea5bf..92db33b58 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index a22a13c6b..3ae43469b 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index 238deb1b8..186d1d83f 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index fba958556..76cda0c78 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index 10425ce9e..480d106eb 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index 0a9ec76ab..0831bb9c4 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/alpine-3-php7/Dockerfile b/docker/php-apache-dev/alpine-3-php7/Dockerfile index 56a3ffd71..c73af9478 100644 --- a/docker/php-apache-dev/alpine-3-php7/Dockerfile +++ b/docker/php-apache-dev/alpine-3-php7/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 705f762ef..e059ad224 100644 --- a/docker/php-apache-dev/alpine-3/Dockerfile +++ b/docker/php-apache-dev/alpine-3/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php-dev:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile index 14437d74f..b2695ed82 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php-dev:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 74a97845d..66a6ec2ba 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php-dev:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 a43ca037d..9b94a5aea 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php-dev:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 bd15e8a0e..eadb943cb 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 4b41471fd..cfec5af47 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php-dev:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 3583b51a5..5cdd4c515 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php-dev:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 ec7357fa4..61c095087 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 2f685bcb9..7c391536c 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 7dc94222d..156540630 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 de6497332..ad169a3c2 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 805ec3a39..eb299d16e 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 7bc44ae7e..953eea2af 100644 --- a/docker/php-apache/alpine-3-php7/Dockerfile +++ b/docker/php-apache/alpine-3-php7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/alpine-3/Dockerfile b/docker/php-apache/alpine-3/Dockerfile index 14a941eb5..ac6ee1b60 100644 --- a/docker/php-apache/alpine-3/Dockerfile +++ b/docker/php-apache/alpine-3/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile index cc500e95e..086a5ac4f 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index f07f0304f..5c8a60ec7 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index 3edb34d3c..29325af7c 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index 2284ac92c..194bae0c0 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index 14d84f210..77ae8c9da 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index 1fcb2298a..42b2ad5d3 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index dff0199aa..b9833546c 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index 622e405fc..31f9aaf90 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index ed896e4f3..8fc8d3199 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index c1e444d44..648e613ee 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index 3357a5ad8..4d096af9e 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-dev/alpine-3-php7/Dockerfile b/docker/php-dev/alpine-3-php7/Dockerfile index 321342a7b..3dc3e2ab9 100644 --- a/docker/php-dev/alpine-3-php7/Dockerfile +++ b/docker/php-dev/alpine-3-php7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine-3/Dockerfile index ba754d5b6..8d34c5176 100644 --- a/docker/php-dev/alpine-3/Dockerfile +++ b/docker/php-dev/alpine-3/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index 1768a03a1..e4977a6f3 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index 3f43e428d..5d0f403be 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index e6c090dea..c7a4371e2 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index 9278f7e18..511f42614 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index 060795e22..b0b015e39 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 0b9eddf1e..3c46b281a 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index 1c4b3a82f..175d81126 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index a0b39d181..6f9a14d68 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index 9fca920f1..5bfa6831f 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index 8bbce175d..2d8c78f7e 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index a1888407b..27cb39726 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 585d3eca8..606f5a78f 100644 --- a/docker/php-nginx-dev/alpine-3-php7/Dockerfile +++ b/docker/php-nginx-dev/alpine-3-php7/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 38e42d68a..8605ac465 100644 --- a/docker/php-nginx-dev/alpine-3/Dockerfile +++ b/docker/php-nginx-dev/alpine-3/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php-dev:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile index 2cf5b8579..ffecae252 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php-dev:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 4e41c9248..e570d3f29 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php-dev:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 e5fff1f0e..24c4b9a0f 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php-dev:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 36c0584fe..d0ff3efbf 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 f6a6328f4..090902422 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php-dev:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 ec46fa9e6..e24faf6b1 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php-dev:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 8178a0222..57f80a42f 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 128162929..7a92237d4 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 54ec285e6..77c1df42b 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 7ecd224e0..ac2e1b0b3 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 d3cb2f895..03a7ff370 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 63e1731a8..bb5cc235a 100644 --- a/docker/php-nginx/alpine-3-php7/Dockerfile +++ b/docker/php-nginx/alpine-3-php7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/alpine-3/Dockerfile b/docker/php-nginx/alpine-3/Dockerfile index c57af0722..66ec37f71 100644 --- a/docker/php-nginx/alpine-3/Dockerfile +++ b/docker/php-nginx/alpine-3/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index b522fad2b..c455f5ae1 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index a0be8fef7..8f7ff5a7b 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index dabe22f2a..b61db5b39 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index 090745c76..75be817a1 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index 2a7a78ea1..1fa80664e 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index c9a88d82d..4f98a2f77 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index 8498314d2..5b122179f 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index 9346c7f91..fba1250f3 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index 2c394bbf7..f203823c7 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index 2a46591fa..1203e5a8b 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index c28c22646..1ab1c1a2c 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/alpine-3-php7/Dockerfile b/docker/php/alpine-3-php7/Dockerfile index d1a882852..cb2224dc7 100644 --- a/docker/php/alpine-3-php7/Dockerfile +++ b/docker/php/alpine-3-php7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base-app:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 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 9ee8c7994..76a94f8c8 100644 --- a/docker/php/alpine-3/Dockerfile +++ b/docker/php/alpine-3/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base-app:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index 0b4f324ba..d16d63cdb 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base-app:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index 83242debf..f83bb2633 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base-app:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index c67d663a3..23eb9cf4e 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base-app:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index dfcad653e..4f7e54693 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base-app:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index 9407b61a9..b929a0aa1 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base-app:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index 336e62118..1282191f4 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base-app:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index 7c076f24f..cf90db949 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index 1b091c8e2..94d80749d 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index e75f7a626..4d8ca9194 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index b03d8809a..521831bab 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index fc24750f9..f3b2f642c 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/piwik/ubuntu-14.04/Dockerfile b/docker/piwik/ubuntu-14.04/Dockerfile index f8f8beb30..e70b38d1f 100644 --- a/docker/piwik/ubuntu-14.04/Dockerfile +++ b/docker/piwik/ubuntu-14.04/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app/piwik/ ENV PIWIK_URL http://example.com/ diff --git a/docker/postfix/latest/Dockerfile b/docker/postfix/latest/Dockerfile index f613beea9..9a394cdab 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base-app:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 COPY conf/ /opt/docker/ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 65680f32e..d49a4e352 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -7,8 +7,8 @@ FROM zendesk/samson:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ############################################################################### diff --git a/docker/samson-deployment/latest/conf/VERSION b/docker/samson-deployment/latest/conf/VERSION index 62f945751..301160a93 100644 --- a/docker/samson-deployment/latest/conf/VERSION +++ b/docker/samson-deployment/latest/conf/VERSION @@ -1 +1 @@ -6 \ No newline at end of file +8 \ No newline at end of file diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index 453c6e519..6859f7344 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 RUN /usr/local/bin/apk-install \ # General sphinx diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index b2eccfe81..031601219 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base-app:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 RUN /opt/docker/bin/control.sh service.enable ssh diff --git a/docker/storage/latest/Dockerfile b/docker/storage/latest/Dockerfile index fdd6d2034..6affa3a95 100644 --- a/docker/storage/latest/Dockerfile +++ b/docker/storage/latest/Dockerfile @@ -7,8 +7,8 @@ FROM busybox:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 RUN mkdir /storage/ \ && chmod 777 /storage/ diff --git a/docker/typo3/ubuntu-14.04/Dockerfile b/docker/typo3/ubuntu-14.04/Dockerfile index 07e0cac3b..d80066324 100644 --- a/docker/typo3/ubuntu-14.04/Dockerfile +++ b/docker/typo3/ubuntu-14.04/Dockerfile @@ -7,8 +7,8 @@ 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.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV WEB_DOCUMENT_ROOT /app/web/ diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index f56ef67fd..9a34791c8 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV VARNISH_PORT 80 diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index b2cb161cb..0e57137e3 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -7,8 +7,8 @@ FROM webdevops/base:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 ENV FTP_USER application ENV FTP_PASSWORD application diff --git a/provisioning/base/general/VERSION b/provisioning/base/general/VERSION index 62f945751..301160a93 100644 --- a/provisioning/base/general/VERSION +++ b/provisioning/base/general/VERSION @@ -1 +1 @@ -6 \ No newline at end of file +8 \ No newline at end of file diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index b2a9987b6..db2c0b7c7 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -9,8 +9,8 @@ FROM {{ image }}:{{ tag }} {% macro version() -%} MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.51.0 +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=0.52.0 {%- endmacro %} {%- macro add(source, target) -%}